2008-07-29 18:54:06 +00:00
|
|
|
/* Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
|
|
|
|
* All Rights Reserved.
|
|
|
|
*
|
|
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
|
|
* copy of this software and associated documentation files (the
|
|
|
|
* "Software"), to deal in the Software without restriction, including
|
|
|
|
* without limitation the rights to use, copy, modify, merge, publish,
|
|
|
|
* distribute, sub license, and/or sell copies of the Software, and to
|
|
|
|
* permit persons to whom the Software is furnished to do so, subject to
|
|
|
|
* the following conditions:
|
|
|
|
*
|
|
|
|
* The above copyright notice and this permission notice (including the
|
|
|
|
* next paragraph) shall be included in all copies or substantial portions
|
|
|
|
* of the Software.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
|
|
|
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
|
|
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
|
|
|
|
* IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
|
|
|
|
* ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
|
|
|
|
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
|
|
|
|
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifndef _I915_REG_H_
|
|
|
|
#define _I915_REG_H_
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
typedef struct {
|
|
|
|
uint32_t reg;
|
|
|
|
} i915_reg_t;
|
|
|
|
|
|
|
|
#define _MMIO(r) ((const i915_reg_t){ .reg = (r) })
|
|
|
|
|
|
|
|
#define INVALID_MMIO_REG _MMIO(0)
|
|
|
|
|
|
|
|
static inline uint32_t i915_mmio_reg_offset(i915_reg_t reg)
|
|
|
|
{
|
|
|
|
return reg.reg;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline bool i915_mmio_reg_equal(i915_reg_t a, i915_reg_t b)
|
|
|
|
{
|
|
|
|
return i915_mmio_reg_offset(a) == i915_mmio_reg_offset(b);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline bool i915_mmio_reg_valid(i915_reg_t reg)
|
|
|
|
{
|
|
|
|
return !i915_mmio_reg_equal(reg, INVALID_MMIO_REG);
|
|
|
|
}
|
|
|
|
|
2010-09-11 12:48:45 +00:00
|
|
|
#define _PIPE(pipe, a, b) ((a) + (pipe)*((b)-(a)))
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define _MMIO_PIPE(pipe, a, b) _MMIO(_PIPE(pipe, a, b))
|
2013-07-03 20:06:04 +00:00
|
|
|
#define _PLANE(plane, a, b) _PIPE(plane, a, b)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define _MMIO_PLANE(plane, a, b) _MMIO_PIPE(plane, a, b)
|
|
|
|
#define _TRANS(tran, a, b) ((a) + (tran)*((b)-(a)))
|
|
|
|
#define _MMIO_TRANS(tran, a, b) _MMIO(_TRANS(tran, a, b))
|
2012-03-29 15:32:22 +00:00
|
|
|
#define _PORT(port, a, b) ((a) + (port)*((b)-(a)))
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define _MMIO_PORT(port, a, b) _MMIO(_PORT(port, a, b))
|
2014-04-09 10:29:08 +00:00
|
|
|
#define _PIPE3(pipe, a, b, c) ((pipe) == PIPE_A ? (a) : \
|
|
|
|
(pipe) == PIPE_B ? (b) : (c))
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define _MMIO_PIPE3(pipe, a, b, c) _MMIO(_PIPE3(pipe, a, b, c))
|
2014-11-14 14:54:21 +00:00
|
|
|
#define _PORT3(port, a, b, c) ((port) == PORT_A ? (a) : \
|
|
|
|
(port) == PORT_B ? (b) : (c))
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define _MMIO_PORT3(pipe, a, b, c) _MMIO(_PORT3(pipe, a, b, c))
|
2012-03-29 15:32:22 +00:00
|
|
|
|
2014-12-08 17:33:51 +00:00
|
|
|
#define _MASKED_FIELD(mask, value) ({ \
|
|
|
|
if (__builtin_constant_p(mask)) \
|
|
|
|
BUILD_BUG_ON_MSG(((mask) & 0xffff0000), "Incorrect mask"); \
|
|
|
|
if (__builtin_constant_p(value)) \
|
|
|
|
BUILD_BUG_ON_MSG((value) & 0xffff0000, "Incorrect value"); \
|
|
|
|
if (__builtin_constant_p(mask) && __builtin_constant_p(value)) \
|
|
|
|
BUILD_BUG_ON_MSG((value) & ~(mask), \
|
|
|
|
"Incorrect value for mask"); \
|
|
|
|
(mask) << 16 | (value); })
|
|
|
|
#define _MASKED_BIT_ENABLE(a) ({ typeof(a) _a = (a); _MASKED_FIELD(_a, _a); })
|
|
|
|
#define _MASKED_BIT_DISABLE(a) (_MASKED_FIELD((a), 0))
|
|
|
|
|
|
|
|
|
2012-04-24 12:04:12 +00:00
|
|
|
|
2008-07-29 18:54:06 +00:00
|
|
|
/* PCI config space */
|
|
|
|
|
2016-04-15 09:03:39 +00:00
|
|
|
#define MCHBAR_I915 0x44
|
|
|
|
#define MCHBAR_I965 0x48
|
|
|
|
#define MCHBAR_SIZE (4 * 4096)
|
|
|
|
|
|
|
|
#define DEVEN 0x54
|
|
|
|
#define DEVEN_MCHBAR_EN (1 << 28)
|
|
|
|
|
|
|
|
#define BSM 0x5c
|
|
|
|
#define BSM_MASK (0xFFFF << 20)
|
|
|
|
|
2015-05-22 08:22:31 +00:00
|
|
|
#define HPLLCC 0xc0 /* 85x only */
|
|
|
|
#define GC_CLOCK_CONTROL_MASK (0x7 << 0)
|
2008-07-29 18:54:06 +00:00
|
|
|
#define GC_CLOCK_133_200 (0 << 0)
|
|
|
|
#define GC_CLOCK_100_200 (1 << 0)
|
|
|
|
#define GC_CLOCK_100_133 (2 << 0)
|
2015-05-22 08:22:31 +00:00
|
|
|
#define GC_CLOCK_133_266 (3 << 0)
|
|
|
|
#define GC_CLOCK_133_200_2 (4 << 0)
|
|
|
|
#define GC_CLOCK_133_266_2 (5 << 0)
|
|
|
|
#define GC_CLOCK_166_266 (6 << 0)
|
|
|
|
#define GC_CLOCK_166_250 (7 << 0)
|
|
|
|
|
2016-04-15 09:03:39 +00:00
|
|
|
#define I915_GDRST 0xc0 /* PCI config register */
|
|
|
|
#define GRDOM_FULL (0 << 2)
|
|
|
|
#define GRDOM_RENDER (1 << 2)
|
|
|
|
#define GRDOM_MEDIA (3 << 2)
|
|
|
|
#define GRDOM_MASK (3 << 2)
|
|
|
|
#define GRDOM_RESET_STATUS (1 << 1)
|
|
|
|
#define GRDOM_RESET_ENABLE (1 << 0)
|
|
|
|
|
|
|
|
#define GCDGMBUS 0xcc
|
|
|
|
|
2010-01-29 19:27:07 +00:00
|
|
|
#define GCFGC2 0xda
|
2008-07-29 18:54:06 +00:00
|
|
|
#define GCFGC 0xf0 /* 915+ only */
|
|
|
|
#define GC_LOW_FREQUENCY_ENABLE (1 << 7)
|
|
|
|
#define GC_DISPLAY_CLOCK_190_200_MHZ (0 << 4)
|
|
|
|
#define GC_DISPLAY_CLOCK_333_MHZ (4 << 4)
|
2013-07-26 06:35:42 +00:00
|
|
|
#define GC_DISPLAY_CLOCK_267_MHZ_PNV (0 << 4)
|
|
|
|
#define GC_DISPLAY_CLOCK_333_MHZ_PNV (1 << 4)
|
|
|
|
#define GC_DISPLAY_CLOCK_444_MHZ_PNV (2 << 4)
|
|
|
|
#define GC_DISPLAY_CLOCK_200_MHZ_PNV (5 << 4)
|
|
|
|
#define GC_DISPLAY_CLOCK_133_MHZ_PNV (6 << 4)
|
|
|
|
#define GC_DISPLAY_CLOCK_167_MHZ_PNV (7 << 4)
|
2008-07-29 18:54:06 +00:00
|
|
|
#define GC_DISPLAY_CLOCK_MASK (7 << 4)
|
2009-08-17 20:31:43 +00:00
|
|
|
#define GM45_GC_RENDER_CLOCK_MASK (0xf << 0)
|
|
|
|
#define GM45_GC_RENDER_CLOCK_266_MHZ (8 << 0)
|
|
|
|
#define GM45_GC_RENDER_CLOCK_320_MHZ (9 << 0)
|
|
|
|
#define GM45_GC_RENDER_CLOCK_400_MHZ (0xb << 0)
|
|
|
|
#define GM45_GC_RENDER_CLOCK_533_MHZ (0xc << 0)
|
|
|
|
#define I965_GC_RENDER_CLOCK_MASK (0xf << 0)
|
|
|
|
#define I965_GC_RENDER_CLOCK_267_MHZ (2 << 0)
|
|
|
|
#define I965_GC_RENDER_CLOCK_333_MHZ (3 << 0)
|
|
|
|
#define I965_GC_RENDER_CLOCK_444_MHZ (4 << 0)
|
|
|
|
#define I965_GC_RENDER_CLOCK_533_MHZ (5 << 0)
|
|
|
|
#define I945_GC_RENDER_CLOCK_MASK (7 << 0)
|
|
|
|
#define I945_GC_RENDER_CLOCK_166_MHZ (0 << 0)
|
|
|
|
#define I945_GC_RENDER_CLOCK_200_MHZ (1 << 0)
|
|
|
|
#define I945_GC_RENDER_CLOCK_250_MHZ (3 << 0)
|
|
|
|
#define I945_GC_RENDER_CLOCK_400_MHZ (5 << 0)
|
|
|
|
#define I915_GC_RENDER_CLOCK_MASK (7 << 0)
|
|
|
|
#define I915_GC_RENDER_CLOCK_166_MHZ (0 << 0)
|
|
|
|
#define I915_GC_RENDER_CLOCK_200_MHZ (1 << 0)
|
|
|
|
#define I915_GC_RENDER_CLOCK_333_MHZ (4 << 0)
|
2014-01-16 15:42:54 +00:00
|
|
|
|
2016-04-15 09:03:39 +00:00
|
|
|
#define ASLE 0xe4
|
|
|
|
#define ASLS 0xfc
|
|
|
|
|
|
|
|
#define SWSCI 0xe8
|
|
|
|
#define SWSCI_SCISEL (1 << 15)
|
|
|
|
#define SWSCI_GSSCIE (1 << 0)
|
|
|
|
|
|
|
|
#define LBPC 0xf4 /* legacy/combination backlight modes, also called LBB */
|
2010-09-11 08:24:50 +00:00
|
|
|
|
2008-07-29 18:54:06 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define ILK_GDSR _MMIO(MCHBAR_MIRROR_BASE + 0x2ca4)
|
2014-05-19 16:23:24 +00:00
|
|
|
#define ILK_GRDOM_FULL (0<<1)
|
|
|
|
#define ILK_GRDOM_RENDER (1<<1)
|
|
|
|
#define ILK_GRDOM_MEDIA (3<<1)
|
|
|
|
#define ILK_GRDOM_MASK (3<<1)
|
|
|
|
#define ILK_GRDOM_RESET_ENABLE (1<<0)
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN6_MBCUNIT_SNPCR _MMIO(0x900c) /* for LLC config */
|
2011-08-03 18:28:44 +00:00
|
|
|
#define GEN6_MBC_SNPCR_SHIFT 21
|
|
|
|
#define GEN6_MBC_SNPCR_MASK (3<<21)
|
|
|
|
#define GEN6_MBC_SNPCR_MAX (0<<21)
|
|
|
|
#define GEN6_MBC_SNPCR_MED (1<<21)
|
|
|
|
#define GEN6_MBC_SNPCR_LOW (2<<21)
|
|
|
|
#define GEN6_MBC_SNPCR_MIN (3<<21) /* only 1/16th of the cache is shared */
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define VLV_G3DCTL _MMIO(0x9024)
|
|
|
|
#define VLV_GSCKGCTL _MMIO(0x9028)
|
2014-05-05 12:13:55 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN6_MBCTL _MMIO(0x0907c)
|
2012-02-09 16:15:48 +00:00
|
|
|
#define GEN6_MBCTL_ENABLE_BOOT_FETCH (1 << 4)
|
|
|
|
#define GEN6_MBCTL_CTX_FETCH_NEEDED (1 << 3)
|
|
|
|
#define GEN6_MBCTL_BME_UPDATE_ENABLE (1 << 2)
|
|
|
|
#define GEN6_MBCTL_MAE_UPDATE_ENABLE (1 << 1)
|
|
|
|
#define GEN6_MBCTL_BOOT_FETCH_MECH (1 << 0)
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN6_GDRST _MMIO(0x941c)
|
2010-11-18 01:31:14 +00:00
|
|
|
#define GEN6_GRDOM_FULL (1 << 0)
|
|
|
|
#define GEN6_GRDOM_RENDER (1 << 1)
|
|
|
|
#define GEN6_GRDOM_MEDIA (1 << 2)
|
|
|
|
#define GEN6_GRDOM_BLT (1 << 3)
|
2016-03-16 15:54:00 +00:00
|
|
|
#define GEN6_GRDOM_VECS (1 << 4)
|
2016-04-04 17:50:56 +00:00
|
|
|
#define GEN9_GRDOM_GUC (1 << 5)
|
2016-03-16 15:54:00 +00:00
|
|
|
#define GEN8_GRDOM_MEDIA2 (1 << 7)
|
2010-11-18 01:31:14 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define RING_PP_DIR_BASE(ring) _MMIO((ring)->mmio_base+0x228)
|
|
|
|
#define RING_PP_DIR_BASE_READ(ring) _MMIO((ring)->mmio_base+0x518)
|
|
|
|
#define RING_PP_DIR_DCLV(ring) _MMIO((ring)->mmio_base+0x220)
|
2012-02-09 16:15:48 +00:00
|
|
|
#define PP_DIR_DCLV_2G 0xffffffff
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN8_RING_PDP_UDW(ring, n) _MMIO((ring)->mmio_base+0x270 + (n) * 8 + 4)
|
|
|
|
#define GEN8_RING_PDP_LDW(ring, n) _MMIO((ring)->mmio_base+0x270 + (n) * 8)
|
2013-11-05 06:29:36 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN8_R_PWR_CLK_STATE _MMIO(0x20C8)
|
2015-02-13 16:27:56 +00:00
|
|
|
#define GEN8_RPCS_ENABLE (1 << 31)
|
|
|
|
#define GEN8_RPCS_S_CNT_ENABLE (1 << 18)
|
|
|
|
#define GEN8_RPCS_S_CNT_SHIFT 15
|
|
|
|
#define GEN8_RPCS_S_CNT_MASK (0x7 << GEN8_RPCS_S_CNT_SHIFT)
|
|
|
|
#define GEN8_RPCS_SS_CNT_ENABLE (1 << 11)
|
|
|
|
#define GEN8_RPCS_SS_CNT_SHIFT 8
|
|
|
|
#define GEN8_RPCS_SS_CNT_MASK (0x7 << GEN8_RPCS_SS_CNT_SHIFT)
|
|
|
|
#define GEN8_RPCS_EU_MAX_SHIFT 4
|
|
|
|
#define GEN8_RPCS_EU_MAX_MASK (0xf << GEN8_RPCS_EU_MAX_SHIFT)
|
|
|
|
#define GEN8_RPCS_EU_MIN_SHIFT 0
|
|
|
|
#define GEN8_RPCS_EU_MIN_MASK (0xf << GEN8_RPCS_EU_MIN_SHIFT)
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GAM_ECOCHK _MMIO(0x4090)
|
2015-02-09 19:33:19 +00:00
|
|
|
#define BDW_DISABLE_HDC_INVALIDATION (1<<25)
|
2012-02-09 16:15:48 +00:00
|
|
|
#define ECOCHK_SNB_BIT (1<<10)
|
2015-07-14 13:41:15 +00:00
|
|
|
#define ECOCHK_DIS_TLB (1<<8)
|
2013-03-20 21:49:14 +00:00
|
|
|
#define HSW_ECOCHK_ARB_PRIO_SOL (1<<6)
|
2012-02-09 16:15:48 +00:00
|
|
|
#define ECOCHK_PPGTT_CACHE64B (0x3<<3)
|
|
|
|
#define ECOCHK_PPGTT_CACHE4B (0x0<<3)
|
2013-04-04 12:13:42 +00:00
|
|
|
#define ECOCHK_PPGTT_GFDT_IVB (0x1<<4)
|
|
|
|
#define ECOCHK_PPGTT_LLC_IVB (0x1<<3)
|
|
|
|
#define ECOCHK_PPGTT_UC_HSW (0x1<<3)
|
|
|
|
#define ECOCHK_PPGTT_WT_HSW (0x2<<3)
|
|
|
|
#define ECOCHK_PPGTT_WB_HSW (0x3<<3)
|
2012-02-09 16:15:48 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GAC_ECO_BITS _MMIO(0x14090)
|
2013-04-04 12:13:40 +00:00
|
|
|
#define ECOBITS_SNB_BIT (1<<13)
|
2012-04-11 18:42:40 +00:00
|
|
|
#define ECOBITS_PPGTT_CACHE64B (3<<8)
|
|
|
|
#define ECOBITS_PPGTT_CACHE4B (0<<8)
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GAB_CTL _MMIO(0x24000)
|
2012-04-11 18:42:39 +00:00
|
|
|
#define GAB_CTL_CONT_AFTER_PAGEFAULT (1<<8)
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN6_STOLEN_RESERVED _MMIO(0x1082C0)
|
2015-08-10 17:57:32 +00:00
|
|
|
#define GEN6_STOLEN_RESERVED_ADDR_MASK (0xFFF << 20)
|
|
|
|
#define GEN7_STOLEN_RESERVED_ADDR_MASK (0x3FFF << 18)
|
|
|
|
#define GEN6_STOLEN_RESERVED_SIZE_MASK (3 << 4)
|
|
|
|
#define GEN6_STOLEN_RESERVED_1M (0 << 4)
|
|
|
|
#define GEN6_STOLEN_RESERVED_512K (1 << 4)
|
|
|
|
#define GEN6_STOLEN_RESERVED_256K (2 << 4)
|
|
|
|
#define GEN6_STOLEN_RESERVED_128K (3 << 4)
|
|
|
|
#define GEN7_STOLEN_RESERVED_SIZE_MASK (1 << 5)
|
|
|
|
#define GEN7_STOLEN_RESERVED_1M (0 << 5)
|
|
|
|
#define GEN7_STOLEN_RESERVED_256K (1 << 5)
|
|
|
|
#define GEN8_STOLEN_RESERVED_SIZE_MASK (3 << 7)
|
|
|
|
#define GEN8_STOLEN_RESERVED_1M (0 << 7)
|
|
|
|
#define GEN8_STOLEN_RESERVED_2M (1 << 7)
|
|
|
|
#define GEN8_STOLEN_RESERVED_4M (2 << 7)
|
|
|
|
#define GEN8_STOLEN_RESERVED_8M (3 << 7)
|
2014-09-11 11:28:08 +00:00
|
|
|
|
2008-07-29 18:54:06 +00:00
|
|
|
/* VGA stuff */
|
|
|
|
|
|
|
|
#define VGA_ST01_MDA 0x3ba
|
|
|
|
#define VGA_ST01_CGA 0x3da
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define _VGA_MSR_WRITE _MMIO(0x3c2)
|
2008-07-29 18:54:06 +00:00
|
|
|
#define VGA_MSR_WRITE 0x3c2
|
|
|
|
#define VGA_MSR_READ 0x3cc
|
|
|
|
#define VGA_MSR_MEM_EN (1<<1)
|
|
|
|
#define VGA_MSR_CGA_MODE (1<<0)
|
|
|
|
|
2013-06-06 10:09:32 +00:00
|
|
|
#define VGA_SR_INDEX 0x3c4
|
2012-11-21 14:55:21 +00:00
|
|
|
#define SR01 1
|
2013-06-06 10:09:32 +00:00
|
|
|
#define VGA_SR_DATA 0x3c5
|
2008-07-29 18:54:06 +00:00
|
|
|
|
|
|
|
#define VGA_AR_INDEX 0x3c0
|
|
|
|
#define VGA_AR_VID_EN (1<<5)
|
|
|
|
#define VGA_AR_DATA_WRITE 0x3c0
|
|
|
|
#define VGA_AR_DATA_READ 0x3c1
|
|
|
|
|
|
|
|
#define VGA_GR_INDEX 0x3ce
|
|
|
|
#define VGA_GR_DATA 0x3cf
|
|
|
|
/* GR05 */
|
|
|
|
#define VGA_GR_MEM_READ_MODE_SHIFT 3
|
|
|
|
#define VGA_GR_MEM_READ_MODE_PLANE 1
|
|
|
|
/* GR06 */
|
|
|
|
#define VGA_GR_MEM_MODE_MASK 0xc
|
|
|
|
#define VGA_GR_MEM_MODE_SHIFT 2
|
|
|
|
#define VGA_GR_MEM_A0000_AFFFF 0
|
|
|
|
#define VGA_GR_MEM_A0000_BFFFF 1
|
|
|
|
#define VGA_GR_MEM_B0000_B7FFF 2
|
|
|
|
#define VGA_GR_MEM_B0000_BFFFF 3
|
|
|
|
|
|
|
|
#define VGA_DACMASK 0x3c6
|
|
|
|
#define VGA_DACRX 0x3c7
|
|
|
|
#define VGA_DACWX 0x3c8
|
|
|
|
#define VGA_DACDATA 0x3c9
|
|
|
|
|
|
|
|
#define VGA_CR_INDEX_MDA 0x3b4
|
|
|
|
#define VGA_CR_DATA_MDA 0x3b5
|
|
|
|
#define VGA_CR_INDEX_CGA 0x3d4
|
|
|
|
#define VGA_CR_DATA_CGA 0x3d5
|
|
|
|
|
2014-02-18 18:15:46 +00:00
|
|
|
/*
|
|
|
|
* Instruction field definitions used by the command parser
|
|
|
|
*/
|
|
|
|
#define INSTR_CLIENT_SHIFT 29
|
|
|
|
#define INSTR_CLIENT_MASK 0xE0000000
|
|
|
|
#define INSTR_MI_CLIENT 0x0
|
|
|
|
#define INSTR_BC_CLIENT 0x2
|
|
|
|
#define INSTR_RC_CLIENT 0x3
|
|
|
|
#define INSTR_SUBCLIENT_SHIFT 27
|
|
|
|
#define INSTR_SUBCLIENT_MASK 0x18000000
|
|
|
|
#define INSTR_MEDIA_SUBCLIENT 0x2
|
2014-11-21 17:35:36 +00:00
|
|
|
#define INSTR_26_TO_24_MASK 0x7000000
|
|
|
|
#define INSTR_26_TO_24_SHIFT 24
|
2014-02-18 18:15:46 +00:00
|
|
|
|
2008-07-29 18:54:06 +00:00
|
|
|
/*
|
|
|
|
* Memory interface instructions used by the kernel
|
|
|
|
*/
|
|
|
|
#define MI_INSTR(opcode, flags) (((opcode) << 23) | (flags))
|
2014-02-18 18:15:54 +00:00
|
|
|
/* Many MI commands use bit 22 of the header dword for GGTT vs PPGTT */
|
|
|
|
#define MI_GLOBAL_GTT (1<<22)
|
2008-07-29 18:54:06 +00:00
|
|
|
|
|
|
|
#define MI_NOOP MI_INSTR(0, 0)
|
|
|
|
#define MI_USER_INTERRUPT MI_INSTR(0x02, 0)
|
|
|
|
#define MI_WAIT_FOR_EVENT MI_INSTR(0x03, 0)
|
2009-09-15 20:57:34 +00:00
|
|
|
#define MI_WAIT_FOR_OVERLAY_FLIP (1<<16)
|
2008-07-29 18:54:06 +00:00
|
|
|
#define MI_WAIT_FOR_PLANE_B_FLIP (1<<6)
|
|
|
|
#define MI_WAIT_FOR_PLANE_A_FLIP (1<<2)
|
|
|
|
#define MI_WAIT_FOR_PLANE_A_SCANLINES (1<<1)
|
|
|
|
#define MI_FLUSH MI_INSTR(0x04, 0)
|
|
|
|
#define MI_READ_FLUSH (1 << 0)
|
|
|
|
#define MI_EXE_FLUSH (1 << 1)
|
|
|
|
#define MI_NO_WRITE_FLUSH (1 << 2)
|
|
|
|
#define MI_SCENE_COUNT (1 << 3) /* just increment scene count */
|
|
|
|
#define MI_END_SCENE (1 << 4) /* flush binner and incr scene count */
|
2010-06-25 05:40:24 +00:00
|
|
|
#define MI_INVALIDATE_ISP (1 << 5) /* invalidate indirect state pointers */
|
2013-12-17 04:50:37 +00:00
|
|
|
#define MI_REPORT_HEAD MI_INSTR(0x07, 0)
|
|
|
|
#define MI_ARB_ON_OFF MI_INSTR(0x08, 0)
|
|
|
|
#define MI_ARB_ENABLE (1<<0)
|
|
|
|
#define MI_ARB_DISABLE (0<<0)
|
2008-07-29 18:54:06 +00:00
|
|
|
#define MI_BATCH_BUFFER_END MI_INSTR(0x0a, 0)
|
2011-01-05 20:01:24 +00:00
|
|
|
#define MI_SUSPEND_FLUSH MI_INSTR(0x0b, 0)
|
|
|
|
#define MI_SUSPEND_FLUSH_EN (1<<0)
|
2014-11-21 17:35:36 +00:00
|
|
|
#define MI_SET_APPID MI_INSTR(0x0e, 0)
|
2011-08-16 19:34:10 +00:00
|
|
|
#define MI_OVERLAY_FLIP MI_INSTR(0x11, 0)
|
2009-09-15 20:57:34 +00:00
|
|
|
#define MI_OVERLAY_CONTINUE (0x0<<21)
|
|
|
|
#define MI_OVERLAY_ON (0x1<<21)
|
|
|
|
#define MI_OVERLAY_OFF (0x2<<21)
|
2008-07-29 18:54:06 +00:00
|
|
|
#define MI_LOAD_SCAN_LINES_INCL MI_INSTR(0x12, 0)
|
2009-11-18 16:25:18 +00:00
|
|
|
#define MI_DISPLAY_FLIP MI_INSTR(0x14, 2)
|
2010-03-26 17:35:20 +00:00
|
|
|
#define MI_DISPLAY_FLIP_I915 MI_INSTR(0x14, 1)
|
2009-11-18 16:25:18 +00:00
|
|
|
#define MI_DISPLAY_FLIP_PLANE(n) ((n) << 20)
|
2012-05-23 12:02:00 +00:00
|
|
|
/* IVB has funny definitions for which plane to flip. */
|
|
|
|
#define MI_DISPLAY_FLIP_IVB_PLANE_A (0 << 19)
|
|
|
|
#define MI_DISPLAY_FLIP_IVB_PLANE_B (1 << 19)
|
|
|
|
#define MI_DISPLAY_FLIP_IVB_SPRITE_A (2 << 19)
|
|
|
|
#define MI_DISPLAY_FLIP_IVB_SPRITE_B (3 << 19)
|
|
|
|
#define MI_DISPLAY_FLIP_IVB_PLANE_C (4 << 19)
|
|
|
|
#define MI_DISPLAY_FLIP_IVB_SPRITE_C (5 << 19)
|
2014-11-13 17:51:46 +00:00
|
|
|
/* SKL ones */
|
|
|
|
#define MI_DISPLAY_FLIP_SKL_PLANE_1_A (0 << 8)
|
|
|
|
#define MI_DISPLAY_FLIP_SKL_PLANE_1_B (1 << 8)
|
|
|
|
#define MI_DISPLAY_FLIP_SKL_PLANE_1_C (2 << 8)
|
|
|
|
#define MI_DISPLAY_FLIP_SKL_PLANE_2_A (4 << 8)
|
|
|
|
#define MI_DISPLAY_FLIP_SKL_PLANE_2_B (5 << 8)
|
|
|
|
#define MI_DISPLAY_FLIP_SKL_PLANE_2_C (6 << 8)
|
|
|
|
#define MI_DISPLAY_FLIP_SKL_PLANE_3_A (7 << 8)
|
|
|
|
#define MI_DISPLAY_FLIP_SKL_PLANE_3_B (8 << 8)
|
|
|
|
#define MI_DISPLAY_FLIP_SKL_PLANE_3_C (9 << 8)
|
2014-06-30 16:53:37 +00:00
|
|
|
#define MI_SEMAPHORE_MBOX MI_INSTR(0x16, 1) /* gen6, gen7 */
|
2013-12-17 04:50:37 +00:00
|
|
|
#define MI_SEMAPHORE_GLOBAL_GTT (1<<22)
|
|
|
|
#define MI_SEMAPHORE_UPDATE (1<<21)
|
|
|
|
#define MI_SEMAPHORE_COMPARE (1<<20)
|
|
|
|
#define MI_SEMAPHORE_REGISTER (1<<18)
|
|
|
|
#define MI_SEMAPHORE_SYNC_VR (0<<16) /* RCS wait for VCS (RVSYNC) */
|
|
|
|
#define MI_SEMAPHORE_SYNC_VER (1<<16) /* RCS wait for VECS (RVESYNC) */
|
|
|
|
#define MI_SEMAPHORE_SYNC_BR (2<<16) /* RCS wait for BCS (RBSYNC) */
|
|
|
|
#define MI_SEMAPHORE_SYNC_BV (0<<16) /* VCS wait for BCS (VBSYNC) */
|
|
|
|
#define MI_SEMAPHORE_SYNC_VEV (1<<16) /* VCS wait for VECS (VVESYNC) */
|
|
|
|
#define MI_SEMAPHORE_SYNC_RV (2<<16) /* VCS wait for RCS (VRSYNC) */
|
|
|
|
#define MI_SEMAPHORE_SYNC_RB (0<<16) /* BCS wait for RCS (BRSYNC) */
|
|
|
|
#define MI_SEMAPHORE_SYNC_VEB (1<<16) /* BCS wait for VECS (BVESYNC) */
|
|
|
|
#define MI_SEMAPHORE_SYNC_VB (2<<16) /* BCS wait for VCS (BVSYNC) */
|
|
|
|
#define MI_SEMAPHORE_SYNC_BVE (0<<16) /* VECS wait for BCS (VEBSYNC) */
|
|
|
|
#define MI_SEMAPHORE_SYNC_VVE (1<<16) /* VECS wait for VCS (VEVSYNC) */
|
|
|
|
#define MI_SEMAPHORE_SYNC_RVE (2<<16) /* VECS wait for RCS (VERSYNC) */
|
2014-03-14 23:08:56 +00:00
|
|
|
#define MI_SEMAPHORE_SYNC_INVALID (3<<16)
|
|
|
|
#define MI_SEMAPHORE_SYNC_MASK (3<<16)
|
2010-06-25 05:40:23 +00:00
|
|
|
#define MI_SET_CONTEXT MI_INSTR(0x18, 0)
|
|
|
|
#define MI_MM_SPACE_GTT (1<<8)
|
|
|
|
#define MI_MM_SPACE_PHYSICAL (0<<8)
|
|
|
|
#define MI_SAVE_EXT_STATE_EN (1<<3)
|
|
|
|
#define MI_RESTORE_EXT_STATE_EN (1<<2)
|
2011-01-05 20:01:24 +00:00
|
|
|
#define MI_FORCE_RESTORE (1<<1)
|
2010-06-25 05:40:23 +00:00
|
|
|
#define MI_RESTORE_INHIBIT (1<<0)
|
2015-06-16 10:39:41 +00:00
|
|
|
#define HSW_MI_RS_SAVE_STATE_EN (1<<3)
|
|
|
|
#define HSW_MI_RS_RESTORE_STATE_EN (1<<2)
|
2014-06-30 16:53:37 +00:00
|
|
|
#define MI_SEMAPHORE_SIGNAL MI_INSTR(0x1b, 0) /* GEN8+ */
|
|
|
|
#define MI_SEMAPHORE_TARGET(engine) ((engine)<<15)
|
2014-06-30 16:53:38 +00:00
|
|
|
#define MI_SEMAPHORE_WAIT MI_INSTR(0x1c, 2) /* GEN8+ */
|
|
|
|
#define MI_SEMAPHORE_POLL (1<<15)
|
|
|
|
#define MI_SEMAPHORE_SAD_GTE_SDD (1<<12)
|
2008-07-29 18:54:06 +00:00
|
|
|
#define MI_STORE_DWORD_IMM MI_INSTR(0x20, 1)
|
2014-11-14 16:16:56 +00:00
|
|
|
#define MI_STORE_DWORD_IMM_GEN4 MI_INSTR(0x20, 2)
|
|
|
|
#define MI_MEM_VIRTUAL (1 << 22) /* 945,g33,965 */
|
|
|
|
#define MI_USE_GGTT (1 << 22) /* g4x+ */
|
2008-07-29 18:54:06 +00:00
|
|
|
#define MI_STORE_DWORD_INDEX MI_INSTR(0x21, 1)
|
|
|
|
#define MI_STORE_DWORD_INDEX_SHIFT 2
|
2010-11-12 13:46:18 +00:00
|
|
|
/* Official intel docs are somewhat sloppy concerning MI_LOAD_REGISTER_IMM:
|
|
|
|
* - Always issue a MI_NOOP _before_ the MI_LOAD_REGISTER_IMM - otherwise hw
|
|
|
|
* simply ignores the register load under certain conditions.
|
|
|
|
* - One can actually load arbitrary many arbitrary registers: Simply issue x
|
|
|
|
* address/value pairs. Don't overdue it, though, x <= 2^4 must hold!
|
|
|
|
*/
|
2014-04-07 19:24:32 +00:00
|
|
|
#define MI_LOAD_REGISTER_IMM(x) MI_INSTR(0x22, 2*(x)-1)
|
drm/i915/bdw: Populate LR contexts (somewhat)
For the most part, logical ring context objects are similar to hardware
contexts in that the backing object is meant to be opaque. There are
some exceptions where we need to poke certain offsets of the object for
initialization, updating the tail pointer or updating the PDPs.
For our basic execlist implementation we'll only need our PPGTT PDs,
and ringbuffer addresses in order to set up the context. With previous
patches, we have both, so start prepping the context to be load.
Before running a context for the first time you must populate some
fields in the context object. These fields begin 1 PAGE + LRCA, ie. the
first page (in 0 based counting) of the context image. These same
fields will be read and written to as contexts are saved and restored
once the system is up and running.
Many of these fields are completely reused from previous global
registers: ringbuffer head/tail/control, context control matches some
previous MI_SET_CONTEXT flags, and page directories. There are other
fields which we don't touch which we may want in the future.
v2: CTX_LRI_HEADER_0 is MI_LOAD_REGISTER_IMM(14) for render and (11)
for other engines.
v3: Several rebases and general changes to the code.
v4: Squash with "Extract LR context object populating"
Also, Damien's review comments:
- Set the Force Posted bit on the LRI header, as the BSpec suggest we do.
- Prevent warning when compiling a 32-bits kernel without HIGHMEM64.
- Add a clarifying comment to the context population code.
v5: Damien's review comments:
- The third MI_LOAD_REGISTER_IMM in the context does not set Force Posted.
- Remove dead code.
v6: Add a note about the (presumed) differences between BDW and CHV state
contexts. Also, Brad's review comments:
- Use the _MASKED_BIT_ENABLE, upper_32_bits and lower_32_bits macros.
- Be less magical about how we set the ring size in the context.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v1)
Signed-off-by: Rafael Barbalho <rafael.barbalho@intel.com> (v2)
Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-07-24 16:04:17 +00:00
|
|
|
#define MI_LRI_FORCE_POSTED (1<<12)
|
2015-08-04 15:22:20 +00:00
|
|
|
#define MI_STORE_REGISTER_MEM MI_INSTR(0x24, 1)
|
|
|
|
#define MI_STORE_REGISTER_MEM_GEN8 MI_INSTR(0x24, 2)
|
2013-12-17 04:50:37 +00:00
|
|
|
#define MI_SRM_LRM_GLOBAL_GTT (1<<22)
|
2011-02-02 12:13:49 +00:00
|
|
|
#define MI_FLUSH_DW MI_INSTR(0x26, 1) /* for GEN6 */
|
2012-10-26 16:42:42 +00:00
|
|
|
#define MI_FLUSH_DW_STORE_INDEX (1<<21)
|
|
|
|
#define MI_INVALIDATE_TLB (1<<18)
|
|
|
|
#define MI_FLUSH_DW_OP_STOREDW (1<<14)
|
2014-02-18 18:15:54 +00:00
|
|
|
#define MI_FLUSH_DW_OP_MASK (3<<14)
|
2014-02-18 18:15:53 +00:00
|
|
|
#define MI_FLUSH_DW_NOTIFY (1<<8)
|
2012-10-26 16:42:42 +00:00
|
|
|
#define MI_INVALIDATE_BSD (1<<7)
|
|
|
|
#define MI_FLUSH_DW_USE_GTT (1<<2)
|
|
|
|
#define MI_FLUSH_DW_USE_PPGTT (0<<2)
|
2015-08-04 15:22:20 +00:00
|
|
|
#define MI_LOAD_REGISTER_MEM MI_INSTR(0x29, 1)
|
|
|
|
#define MI_LOAD_REGISTER_MEM_GEN8 MI_INSTR(0x29, 2)
|
2008-07-29 18:54:06 +00:00
|
|
|
#define MI_BATCH_BUFFER MI_INSTR(0x30, 1)
|
2012-10-17 11:09:54 +00:00
|
|
|
#define MI_BATCH_NON_SECURE (1)
|
|
|
|
/* for snb/ivb/vlv this also means "batch in ppgtt" when ppgtt is enabled. */
|
2013-12-17 04:50:37 +00:00
|
|
|
#define MI_BATCH_NON_SECURE_I965 (1<<8)
|
2012-10-17 11:09:54 +00:00
|
|
|
#define MI_BATCH_PPGTT_HSW (1<<8)
|
2013-12-17 04:50:37 +00:00
|
|
|
#define MI_BATCH_NON_SECURE_HSW (1<<13)
|
2008-07-29 18:54:06 +00:00
|
|
|
#define MI_BATCH_BUFFER_START MI_INSTR(0x31, 0)
|
2012-04-17 15:38:12 +00:00
|
|
|
#define MI_BATCH_GTT (2<<6) /* aliased with (1<<7) on gen4 */
|
2013-11-03 04:07:12 +00:00
|
|
|
#define MI_BATCH_BUFFER_START_GEN8 MI_INSTR(0x31, 1)
|
2015-06-16 10:39:40 +00:00
|
|
|
#define MI_BATCH_RESOURCE_STREAMER (1<<10)
|
2013-12-17 04:50:37 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define MI_PREDICATE_SRC0 _MMIO(0x2400)
|
|
|
|
#define MI_PREDICATE_SRC0_UDW _MMIO(0x2400 + 4)
|
|
|
|
#define MI_PREDICATE_SRC1 _MMIO(0x2408)
|
|
|
|
#define MI_PREDICATE_SRC1_UDW _MMIO(0x2408 + 4)
|
2013-08-28 19:45:46 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define MI_PREDICATE_RESULT_2 _MMIO(0x2214)
|
2013-08-28 19:45:46 +00:00
|
|
|
#define LOWER_SLICE_ENABLED (1<<0)
|
|
|
|
#define LOWER_SLICE_DISABLED (0<<0)
|
|
|
|
|
2008-07-29 18:54:06 +00:00
|
|
|
/*
|
|
|
|
* 3D instructions used by the kernel
|
|
|
|
*/
|
|
|
|
#define GFX_INSTR(opcode, flags) ((0x3 << 29) | ((opcode) << 24) | (flags))
|
|
|
|
|
|
|
|
#define GFX_OP_RASTER_RULES ((0x3<<29)|(0x7<<24))
|
|
|
|
#define GFX_OP_SCISSOR ((0x3<<29)|(0x1c<<24)|(0x10<<19))
|
|
|
|
#define SC_UPDATE_SCISSOR (0x1<<1)
|
|
|
|
#define SC_ENABLE_MASK (0x1<<0)
|
|
|
|
#define SC_ENABLE (0x1<<0)
|
|
|
|
#define GFX_OP_LOAD_INDIRECT ((0x3<<29)|(0x1d<<24)|(0x7<<16))
|
|
|
|
#define GFX_OP_SCISSOR_INFO ((0x3<<29)|(0x1d<<24)|(0x81<<16)|(0x1))
|
|
|
|
#define SCI_YMIN_MASK (0xffff<<16)
|
|
|
|
#define SCI_XMIN_MASK (0xffff<<0)
|
|
|
|
#define SCI_YMAX_MASK (0xffff<<16)
|
|
|
|
#define SCI_XMAX_MASK (0xffff<<0)
|
|
|
|
#define GFX_OP_SCISSOR_ENABLE ((0x3<<29)|(0x1c<<24)|(0x10<<19))
|
|
|
|
#define GFX_OP_SCISSOR_RECT ((0x3<<29)|(0x1d<<24)|(0x81<<16)|1)
|
|
|
|
#define GFX_OP_COLOR_FACTOR ((0x3<<29)|(0x1d<<24)|(0x1<<16)|0x0)
|
|
|
|
#define GFX_OP_STIPPLE ((0x3<<29)|(0x1d<<24)|(0x83<<16))
|
|
|
|
#define GFX_OP_MAP_INFO ((0x3<<29)|(0x1d<<24)|0x4)
|
|
|
|
#define GFX_OP_DESTBUFFER_VARS ((0x3<<29)|(0x1d<<24)|(0x85<<16)|0x0)
|
|
|
|
#define GFX_OP_DESTBUFFER_INFO ((0x3<<29)|(0x1d<<24)|(0x8e<<16)|1)
|
|
|
|
#define GFX_OP_DRAWRECT_INFO ((0x3<<29)|(0x1d<<24)|(0x80<<16)|(0x3))
|
|
|
|
#define GFX_OP_DRAWRECT_INFO_I965 ((0x7900<<16)|0x2)
|
drm/i915: Evict CS TLBs between batches
Running igt, I was encountering the invalid TLB bug on my 845g, despite
that it was using the CS workaround. Examining the w/a buffer in the
error state, showed that the copy from the user batch into the
workaround itself was suffering from the invalid TLB bug (the first
cacheline was broken with the first two words reversed). Time to try a
fresh approach. This extends the workaround to write into each page of
our scratch buffer in order to overflow the TLB and evict the invalid
entries. This could be refined to only do so after we update the GTT,
but for simplicity, we do it before each batch.
I suspect this supersedes our current workaround, but for safety keep
doing both.
v2: The magic number shall be 2.
This doesn't conclusively prove that it is the mythical TLB bug we've
been trying to workaround for so long, that it requires touching a number
of pages to prevent the corruption indicates to me that it is TLB
related, but the corruption (the reversed cacheline) is more subtle than
a TLB bug, where we would expect it to read the wrong page entirely.
Oh well, it prevents a reliable hang for me and so probably for others
as well.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: stable@vger.kernel.org
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
2014-09-08 13:25:41 +00:00
|
|
|
|
|
|
|
#define COLOR_BLT_CMD (2<<29 | 0x40<<22 | (5-2))
|
|
|
|
#define SRC_COPY_BLT_CMD ((2<<29)|(0x43<<22)|4)
|
2008-07-29 18:54:06 +00:00
|
|
|
#define XY_SRC_COPY_BLT_CMD ((2<<29)|(0x53<<22)|6)
|
|
|
|
#define XY_MONO_SRC_COPY_IMM_BLT ((2<<29)|(0x71<<22)|5)
|
drm/i915: Evict CS TLBs between batches
Running igt, I was encountering the invalid TLB bug on my 845g, despite
that it was using the CS workaround. Examining the w/a buffer in the
error state, showed that the copy from the user batch into the
workaround itself was suffering from the invalid TLB bug (the first
cacheline was broken with the first two words reversed). Time to try a
fresh approach. This extends the workaround to write into each page of
our scratch buffer in order to overflow the TLB and evict the invalid
entries. This could be refined to only do so after we update the GTT,
but for simplicity, we do it before each batch.
I suspect this supersedes our current workaround, but for safety keep
doing both.
v2: The magic number shall be 2.
This doesn't conclusively prove that it is the mythical TLB bug we've
been trying to workaround for so long, that it requires touching a number
of pages to prevent the corruption indicates to me that it is TLB
related, but the corruption (the reversed cacheline) is more subtle than
a TLB bug, where we would expect it to read the wrong page entirely.
Oh well, it prevents a reliable hang for me and so probably for others
as well.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: stable@vger.kernel.org
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
2014-09-08 13:25:41 +00:00
|
|
|
#define BLT_WRITE_A (2<<20)
|
|
|
|
#define BLT_WRITE_RGB (1<<20)
|
|
|
|
#define BLT_WRITE_RGBA (BLT_WRITE_RGB | BLT_WRITE_A)
|
2008-07-29 18:54:06 +00:00
|
|
|
#define BLT_DEPTH_8 (0<<24)
|
|
|
|
#define BLT_DEPTH_16_565 (1<<24)
|
|
|
|
#define BLT_DEPTH_16_1555 (2<<24)
|
|
|
|
#define BLT_DEPTH_32 (3<<24)
|
drm/i915: Evict CS TLBs between batches
Running igt, I was encountering the invalid TLB bug on my 845g, despite
that it was using the CS workaround. Examining the w/a buffer in the
error state, showed that the copy from the user batch into the
workaround itself was suffering from the invalid TLB bug (the first
cacheline was broken with the first two words reversed). Time to try a
fresh approach. This extends the workaround to write into each page of
our scratch buffer in order to overflow the TLB and evict the invalid
entries. This could be refined to only do so after we update the GTT,
but for simplicity, we do it before each batch.
I suspect this supersedes our current workaround, but for safety keep
doing both.
v2: The magic number shall be 2.
This doesn't conclusively prove that it is the mythical TLB bug we've
been trying to workaround for so long, that it requires touching a number
of pages to prevent the corruption indicates to me that it is TLB
related, but the corruption (the reversed cacheline) is more subtle than
a TLB bug, where we would expect it to read the wrong page entirely.
Oh well, it prevents a reliable hang for me and so probably for others
as well.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: stable@vger.kernel.org
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
2014-09-08 13:25:41 +00:00
|
|
|
#define BLT_ROP_SRC_COPY (0xcc<<16)
|
|
|
|
#define BLT_ROP_COLOR_COPY (0xf0<<16)
|
2008-07-29 18:54:06 +00:00
|
|
|
#define XY_SRC_COPY_BLT_SRC_TILED (1<<15) /* 965+ only */
|
|
|
|
#define XY_SRC_COPY_BLT_DST_TILED (1<<11) /* 965+ only */
|
|
|
|
#define CMD_OP_DISPLAYBUFFER_INFO ((0x0<<29)|(0x14<<23)|2)
|
|
|
|
#define ASYNC_FLIP (1<<22)
|
|
|
|
#define DISPLAY_PLANE_A (0<<20)
|
|
|
|
#define DISPLAY_PLANE_B (1<<20)
|
2015-09-18 17:03:39 +00:00
|
|
|
#define GFX_OP_PIPE_CONTROL(len) ((0x3<<29)|(0x3<<27)|(0x2<<24)|((len)-2))
|
2015-06-23 14:46:57 +00:00
|
|
|
#define PIPE_CONTROL_FLUSH_L3 (1<<27)
|
2013-02-14 19:53:51 +00:00
|
|
|
#define PIPE_CONTROL_GLOBAL_GTT_IVB (1<<24) /* gen7+ */
|
2014-02-18 18:15:52 +00:00
|
|
|
#define PIPE_CONTROL_MMIO_WRITE (1<<23)
|
2014-02-18 18:15:55 +00:00
|
|
|
#define PIPE_CONTROL_STORE_DATA_INDEX (1<<21)
|
2011-10-16 08:23:31 +00:00
|
|
|
#define PIPE_CONTROL_CS_STALL (1<<20)
|
2012-06-04 21:42:49 +00:00
|
|
|
#define PIPE_CONTROL_TLB_INVALIDATE (1<<18)
|
2014-12-16 08:44:31 +00:00
|
|
|
#define PIPE_CONTROL_MEDIA_STATE_CLEAR (1<<16)
|
2011-10-11 21:41:09 +00:00
|
|
|
#define PIPE_CONTROL_QW_WRITE (1<<14)
|
2014-02-18 18:15:54 +00:00
|
|
|
#define PIPE_CONTROL_POST_SYNC_OP_MASK (3<<14)
|
2011-10-11 21:41:09 +00:00
|
|
|
#define PIPE_CONTROL_DEPTH_STALL (1<<13)
|
|
|
|
#define PIPE_CONTROL_WRITE_FLUSH (1<<12)
|
2011-10-16 08:23:31 +00:00
|
|
|
#define PIPE_CONTROL_RENDER_TARGET_CACHE_FLUSH (1<<12) /* gen6+ */
|
2011-10-11 21:41:09 +00:00
|
|
|
#define PIPE_CONTROL_INSTRUCTION_CACHE_INVALIDATE (1<<11) /* MBZ on Ironlake */
|
|
|
|
#define PIPE_CONTROL_TEXTURE_CACHE_INVALIDATE (1<<10) /* GM45+ only */
|
|
|
|
#define PIPE_CONTROL_INDIRECT_STATE_DISABLE (1<<9)
|
|
|
|
#define PIPE_CONTROL_NOTIFY (1<<8)
|
2014-06-30 16:53:37 +00:00
|
|
|
#define PIPE_CONTROL_FLUSH_ENABLE (1<<7) /* gen7+ */
|
2015-06-19 17:37:13 +00:00
|
|
|
#define PIPE_CONTROL_DC_FLUSH_ENABLE (1<<5)
|
2011-10-16 08:23:31 +00:00
|
|
|
#define PIPE_CONTROL_VF_CACHE_INVALIDATE (1<<4)
|
|
|
|
#define PIPE_CONTROL_CONST_CACHE_INVALIDATE (1<<3)
|
|
|
|
#define PIPE_CONTROL_STATE_CACHE_INVALIDATE (1<<2)
|
2011-10-11 21:41:09 +00:00
|
|
|
#define PIPE_CONTROL_STALL_AT_SCOREBOARD (1<<1)
|
2011-10-16 08:23:31 +00:00
|
|
|
#define PIPE_CONTROL_DEPTH_CACHE_FLUSH (1<<0)
|
2010-04-21 18:39:23 +00:00
|
|
|
#define PIPE_CONTROL_GLOBAL_GTT (1<<2) /* in addr dword */
|
2008-07-29 18:54:06 +00:00
|
|
|
|
2014-02-18 18:15:47 +00:00
|
|
|
/*
|
|
|
|
* Commands used only by the command parser
|
|
|
|
*/
|
|
|
|
#define MI_SET_PREDICATE MI_INSTR(0x01, 0)
|
|
|
|
#define MI_ARB_CHECK MI_INSTR(0x05, 0)
|
|
|
|
#define MI_RS_CONTROL MI_INSTR(0x06, 0)
|
|
|
|
#define MI_URB_ATOMIC_ALLOC MI_INSTR(0x09, 0)
|
|
|
|
#define MI_PREDICATE MI_INSTR(0x0C, 0)
|
|
|
|
#define MI_RS_CONTEXT MI_INSTR(0x0F, 0)
|
|
|
|
#define MI_TOPOLOGY_FILTER MI_INSTR(0x0D, 0)
|
2014-02-18 18:15:48 +00:00
|
|
|
#define MI_LOAD_SCAN_LINES_EXCL MI_INSTR(0x13, 0)
|
2014-02-18 18:15:47 +00:00
|
|
|
#define MI_URB_CLEAR MI_INSTR(0x19, 0)
|
|
|
|
#define MI_UPDATE_GTT MI_INSTR(0x23, 0)
|
|
|
|
#define MI_CLFLUSH MI_INSTR(0x27, 0)
|
2014-02-18 18:15:54 +00:00
|
|
|
#define MI_REPORT_PERF_COUNT MI_INSTR(0x28, 0)
|
|
|
|
#define MI_REPORT_PERF_COUNT_GGTT (1<<0)
|
2014-02-18 18:15:47 +00:00
|
|
|
#define MI_LOAD_REGISTER_REG MI_INSTR(0x2A, 0)
|
|
|
|
#define MI_RS_STORE_DATA_IMM MI_INSTR(0x2B, 0)
|
|
|
|
#define MI_LOAD_URB_MEM MI_INSTR(0x2C, 0)
|
|
|
|
#define MI_STORE_URB_MEM MI_INSTR(0x2D, 0)
|
|
|
|
#define MI_CONDITIONAL_BATCH_BUFFER_END MI_INSTR(0x36, 0)
|
|
|
|
|
|
|
|
#define PIPELINE_SELECT ((0x3<<29)|(0x1<<27)|(0x1<<24)|(0x4<<16))
|
|
|
|
#define GFX_OP_3DSTATE_VF_STATISTICS ((0x3<<29)|(0x1<<27)|(0x0<<24)|(0xB<<16))
|
2014-02-18 18:15:52 +00:00
|
|
|
#define MEDIA_VFE_STATE ((0x3<<29)|(0x2<<27)|(0x0<<24)|(0x0<<16))
|
|
|
|
#define MEDIA_VFE_STATE_MMIO_ACCESS_MASK (0x18)
|
2014-02-18 18:15:47 +00:00
|
|
|
#define GPGPU_OBJECT ((0x3<<29)|(0x2<<27)|(0x1<<24)|(0x4<<16))
|
|
|
|
#define GPGPU_WALKER ((0x3<<29)|(0x2<<27)|(0x1<<24)|(0x5<<16))
|
|
|
|
#define GFX_OP_3DSTATE_DX9_CONSTANTF_VS \
|
|
|
|
((0x3<<29)|(0x3<<27)|(0x0<<24)|(0x39<<16))
|
|
|
|
#define GFX_OP_3DSTATE_DX9_CONSTANTF_PS \
|
|
|
|
((0x3<<29)|(0x3<<27)|(0x0<<24)|(0x3A<<16))
|
|
|
|
#define GFX_OP_3DSTATE_SO_DECL_LIST \
|
|
|
|
((0x3<<29)|(0x3<<27)|(0x1<<24)|(0x17<<16))
|
|
|
|
|
|
|
|
#define GFX_OP_3DSTATE_BINDING_TABLE_EDIT_VS \
|
|
|
|
((0x3<<29)|(0x3<<27)|(0x0<<24)|(0x43<<16))
|
|
|
|
#define GFX_OP_3DSTATE_BINDING_TABLE_EDIT_GS \
|
|
|
|
((0x3<<29)|(0x3<<27)|(0x0<<24)|(0x44<<16))
|
|
|
|
#define GFX_OP_3DSTATE_BINDING_TABLE_EDIT_HS \
|
|
|
|
((0x3<<29)|(0x3<<27)|(0x0<<24)|(0x45<<16))
|
|
|
|
#define GFX_OP_3DSTATE_BINDING_TABLE_EDIT_DS \
|
|
|
|
((0x3<<29)|(0x3<<27)|(0x0<<24)|(0x46<<16))
|
|
|
|
#define GFX_OP_3DSTATE_BINDING_TABLE_EDIT_PS \
|
|
|
|
((0x3<<29)|(0x3<<27)|(0x0<<24)|(0x47<<16))
|
|
|
|
|
|
|
|
#define MFX_WAIT ((0x3<<29)|(0x1<<27)|(0x0<<16))
|
|
|
|
|
|
|
|
#define COLOR_BLT ((0x2<<29)|(0x40<<22))
|
|
|
|
#define SRC_COPY_BLT ((0x2<<29)|(0x43<<22))
|
2010-10-01 11:05:06 +00:00
|
|
|
|
2014-02-18 18:15:50 +00:00
|
|
|
/*
|
|
|
|
* Registers used only by the command parser
|
|
|
|
*/
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define BCS_SWCTRL _MMIO(0x22200)
|
|
|
|
|
|
|
|
#define GPGPU_THREADS_DISPATCHED _MMIO(0x2290)
|
|
|
|
#define GPGPU_THREADS_DISPATCHED_UDW _MMIO(0x2290 + 4)
|
|
|
|
#define HS_INVOCATION_COUNT _MMIO(0x2300)
|
|
|
|
#define HS_INVOCATION_COUNT_UDW _MMIO(0x2300 + 4)
|
|
|
|
#define DS_INVOCATION_COUNT _MMIO(0x2308)
|
|
|
|
#define DS_INVOCATION_COUNT_UDW _MMIO(0x2308 + 4)
|
|
|
|
#define IA_VERTICES_COUNT _MMIO(0x2310)
|
|
|
|
#define IA_VERTICES_COUNT_UDW _MMIO(0x2310 + 4)
|
|
|
|
#define IA_PRIMITIVES_COUNT _MMIO(0x2318)
|
|
|
|
#define IA_PRIMITIVES_COUNT_UDW _MMIO(0x2318 + 4)
|
|
|
|
#define VS_INVOCATION_COUNT _MMIO(0x2320)
|
|
|
|
#define VS_INVOCATION_COUNT_UDW _MMIO(0x2320 + 4)
|
|
|
|
#define GS_INVOCATION_COUNT _MMIO(0x2328)
|
|
|
|
#define GS_INVOCATION_COUNT_UDW _MMIO(0x2328 + 4)
|
|
|
|
#define GS_PRIMITIVES_COUNT _MMIO(0x2330)
|
|
|
|
#define GS_PRIMITIVES_COUNT_UDW _MMIO(0x2330 + 4)
|
|
|
|
#define CL_INVOCATION_COUNT _MMIO(0x2338)
|
|
|
|
#define CL_INVOCATION_COUNT_UDW _MMIO(0x2338 + 4)
|
|
|
|
#define CL_PRIMITIVES_COUNT _MMIO(0x2340)
|
|
|
|
#define CL_PRIMITIVES_COUNT_UDW _MMIO(0x2340 + 4)
|
|
|
|
#define PS_INVOCATION_COUNT _MMIO(0x2348)
|
|
|
|
#define PS_INVOCATION_COUNT_UDW _MMIO(0x2348 + 4)
|
|
|
|
#define PS_DEPTH_COUNT _MMIO(0x2350)
|
|
|
|
#define PS_DEPTH_COUNT_UDW _MMIO(0x2350 + 4)
|
2014-02-18 18:15:50 +00:00
|
|
|
|
|
|
|
/* There are the 4 64-bit counter registers, one for each stream output */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN7_SO_NUM_PRIMS_WRITTEN(n) _MMIO(0x5200 + (n) * 8)
|
|
|
|
#define GEN7_SO_NUM_PRIMS_WRITTEN_UDW(n) _MMIO(0x5200 + (n) * 8 + 4)
|
2014-02-18 18:15:50 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN7_SO_PRIM_STORAGE_NEEDED(n) _MMIO(0x5240 + (n) * 8)
|
|
|
|
#define GEN7_SO_PRIM_STORAGE_NEEDED_UDW(n) _MMIO(0x5240 + (n) * 8 + 4)
|
2014-04-08 21:18:58 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN7_3DPRIM_END_OFFSET _MMIO(0x2420)
|
|
|
|
#define GEN7_3DPRIM_START_VERTEX _MMIO(0x2430)
|
|
|
|
#define GEN7_3DPRIM_VERTEX_COUNT _MMIO(0x2434)
|
|
|
|
#define GEN7_3DPRIM_INSTANCE_COUNT _MMIO(0x2438)
|
|
|
|
#define GEN7_3DPRIM_START_INSTANCE _MMIO(0x243C)
|
|
|
|
#define GEN7_3DPRIM_BASE_VERTEX _MMIO(0x2440)
|
2014-04-08 21:18:58 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN7_GPGPU_DISPATCHDIMX _MMIO(0x2500)
|
|
|
|
#define GEN7_GPGPU_DISPATCHDIMY _MMIO(0x2504)
|
|
|
|
#define GEN7_GPGPU_DISPATCHDIMZ _MMIO(0x2508)
|
2015-10-02 06:09:58 +00:00
|
|
|
|
2016-03-07 07:30:29 +00:00
|
|
|
/* There are the 16 64-bit CS General Purpose Registers */
|
|
|
|
#define HSW_CS_GPR(n) _MMIO(0x2600 + (n) * 8)
|
|
|
|
#define HSW_CS_GPR_UDW(n) _MMIO(0x2600 + (n) * 8 + 4)
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define OACONTROL _MMIO(0x2360)
|
2014-03-26 05:52:03 +00:00
|
|
|
|
2014-02-18 18:15:51 +00:00
|
|
|
#define _GEN7_PIPEA_DE_LOAD_SL 0x70068
|
|
|
|
#define _GEN7_PIPEB_DE_LOAD_SL 0x71068
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN7_PIPE_DE_LOAD_SL(pipe) _MMIO_PIPE(pipe, _GEN7_PIPEA_DE_LOAD_SL, _GEN7_PIPEB_DE_LOAD_SL)
|
2014-02-18 18:15:51 +00:00
|
|
|
|
2010-10-01 11:05:06 +00:00
|
|
|
/*
|
|
|
|
* Reset registers
|
|
|
|
*/
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define DEBUG_RESET_I830 _MMIO(0x6070)
|
2010-10-01 11:05:06 +00:00
|
|
|
#define DEBUG_RESET_FULL (1<<7)
|
|
|
|
#define DEBUG_RESET_RENDER (1<<8)
|
|
|
|
#define DEBUG_RESET_DISPLAY (1<<9)
|
|
|
|
|
2012-03-28 20:39:25 +00:00
|
|
|
/*
|
2013-05-22 12:36:17 +00:00
|
|
|
* IOSF sideband
|
|
|
|
*/
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define VLV_IOSF_DOORBELL_REQ _MMIO(VLV_DISPLAY_BASE + 0x2100)
|
2013-05-22 12:36:17 +00:00
|
|
|
#define IOSF_DEVFN_SHIFT 24
|
|
|
|
#define IOSF_OPCODE_SHIFT 16
|
|
|
|
#define IOSF_PORT_SHIFT 8
|
|
|
|
#define IOSF_BYTE_ENABLES_SHIFT 4
|
|
|
|
#define IOSF_BAR_SHIFT 1
|
|
|
|
#define IOSF_SB_BUSY (1<<0)
|
2016-02-04 10:50:53 +00:00
|
|
|
#define IOSF_PORT_BUNIT 0x03
|
|
|
|
#define IOSF_PORT_PUNIT 0x04
|
2013-05-22 12:36:17 +00:00
|
|
|
#define IOSF_PORT_NC 0x11
|
|
|
|
#define IOSF_PORT_DPIO 0x12
|
2013-08-27 12:12:14 +00:00
|
|
|
#define IOSF_PORT_GPIO_NC 0x13
|
|
|
|
#define IOSF_PORT_CCK 0x14
|
2016-02-04 10:50:53 +00:00
|
|
|
#define IOSF_PORT_DPIO_2 0x1a
|
|
|
|
#define IOSF_PORT_FLISDSI 0x1b
|
2016-02-04 16:55:15 +00:00
|
|
|
#define IOSF_PORT_GPIO_SC 0x48
|
|
|
|
#define IOSF_PORT_GPIO_SUS 0xa8
|
2016-02-04 10:50:53 +00:00
|
|
|
#define IOSF_PORT_CCU 0xa9
|
2016-03-18 11:11:15 +00:00
|
|
|
#define CHV_IOSF_PORT_GPIO_N 0x13
|
|
|
|
#define CHV_IOSF_PORT_GPIO_SE 0x48
|
|
|
|
#define CHV_IOSF_PORT_GPIO_E 0xa8
|
|
|
|
#define CHV_IOSF_PORT_GPIO_SW 0xb2
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define VLV_IOSF_DATA _MMIO(VLV_DISPLAY_BASE + 0x2104)
|
|
|
|
#define VLV_IOSF_ADDR _MMIO(VLV_DISPLAY_BASE + 0x2108)
|
2013-05-22 12:36:17 +00:00
|
|
|
|
2013-11-04 21:48:12 +00:00
|
|
|
/* See configdb bunit SB addr map */
|
|
|
|
#define BUNIT_REG_BISOC 0x11
|
|
|
|
|
|
|
|
#define PUNIT_REG_DSPFREQ 0x36
|
2014-06-27 23:03:57 +00:00
|
|
|
#define DSPFREQSTAT_SHIFT_CHV 24
|
|
|
|
#define DSPFREQSTAT_MASK_CHV (0x1f << DSPFREQSTAT_SHIFT_CHV)
|
|
|
|
#define DSPFREQGUAR_SHIFT_CHV 8
|
|
|
|
#define DSPFREQGUAR_MASK_CHV (0x1f << DSPFREQGUAR_SHIFT_CHV)
|
2013-11-04 21:48:12 +00:00
|
|
|
#define DSPFREQSTAT_SHIFT 30
|
|
|
|
#define DSPFREQSTAT_MASK (0x3 << DSPFREQSTAT_SHIFT)
|
|
|
|
#define DSPFREQGUAR_SHIFT 14
|
|
|
|
#define DSPFREQGUAR_MASK (0x3 << DSPFREQGUAR_SHIFT)
|
2015-03-05 19:19:51 +00:00
|
|
|
#define DSP_MAXFIFO_PM5_STATUS (1 << 22) /* chv */
|
|
|
|
#define DSP_AUTO_CDCLK_GATE_DISABLE (1 << 7) /* chv */
|
|
|
|
#define DSP_MAXFIFO_PM5_ENABLE (1 << 6) /* chv */
|
2014-06-27 23:04:11 +00:00
|
|
|
#define _DP_SSC(val, pipe) ((val) << (2 * (pipe)))
|
|
|
|
#define DP_SSC_MASK(pipe) _DP_SSC(0x3, (pipe))
|
|
|
|
#define DP_SSC_PWR_ON(pipe) _DP_SSC(0x0, (pipe))
|
|
|
|
#define DP_SSC_CLK_GATE(pipe) _DP_SSC(0x1, (pipe))
|
|
|
|
#define DP_SSC_RESET(pipe) _DP_SSC(0x2, (pipe))
|
|
|
|
#define DP_SSC_PWR_GATE(pipe) _DP_SSC(0x3, (pipe))
|
|
|
|
#define _DP_SSS(val, pipe) ((val) << (2 * (pipe) + 16))
|
|
|
|
#define DP_SSS_MASK(pipe) _DP_SSS(0x3, (pipe))
|
|
|
|
#define DP_SSS_PWR_ON(pipe) _DP_SSS(0x0, (pipe))
|
|
|
|
#define DP_SSS_CLK_GATE(pipe) _DP_SSS(0x1, (pipe))
|
|
|
|
#define DP_SSS_RESET(pipe) _DP_SSS(0x2, (pipe))
|
|
|
|
#define DP_SSS_PWR_GATE(pipe) _DP_SSS(0x3, (pipe))
|
2014-03-04 17:23:02 +00:00
|
|
|
|
|
|
|
/* See the PUNIT HAS v0.8 for the below bits */
|
|
|
|
enum punit_power_well {
|
2015-11-16 14:01:05 +00:00
|
|
|
/* These numbers are fixed and must match the position of the pw bits */
|
2014-03-04 17:23:02 +00:00
|
|
|
PUNIT_POWER_WELL_RENDER = 0,
|
|
|
|
PUNIT_POWER_WELL_MEDIA = 1,
|
|
|
|
PUNIT_POWER_WELL_DISP2D = 3,
|
|
|
|
PUNIT_POWER_WELL_DPIO_CMN_BC = 5,
|
|
|
|
PUNIT_POWER_WELL_DPIO_TX_B_LANES_01 = 6,
|
|
|
|
PUNIT_POWER_WELL_DPIO_TX_B_LANES_23 = 7,
|
|
|
|
PUNIT_POWER_WELL_DPIO_TX_C_LANES_01 = 8,
|
|
|
|
PUNIT_POWER_WELL_DPIO_TX_C_LANES_23 = 9,
|
|
|
|
PUNIT_POWER_WELL_DPIO_RX0 = 10,
|
|
|
|
PUNIT_POWER_WELL_DPIO_RX1 = 11,
|
2014-06-27 23:04:08 +00:00
|
|
|
PUNIT_POWER_WELL_DPIO_CMN_D = 12,
|
2014-03-04 17:23:02 +00:00
|
|
|
|
2015-11-16 14:01:05 +00:00
|
|
|
/* Not actual bit groups. Used as IDs for lookup_power_well() */
|
2015-11-04 17:24:10 +00:00
|
|
|
PUNIT_POWER_WELL_ALWAYS_ON,
|
2014-03-04 17:23:02 +00:00
|
|
|
};
|
|
|
|
|
2015-02-04 13:57:44 +00:00
|
|
|
enum skl_disp_power_wells {
|
2015-11-16 14:01:05 +00:00
|
|
|
/* These numbers are fixed and must match the position of the pw bits */
|
2015-02-04 13:57:44 +00:00
|
|
|
SKL_DISP_PW_MISC_IO,
|
|
|
|
SKL_DISP_PW_DDI_A_E,
|
|
|
|
SKL_DISP_PW_DDI_B,
|
|
|
|
SKL_DISP_PW_DDI_C,
|
|
|
|
SKL_DISP_PW_DDI_D,
|
|
|
|
SKL_DISP_PW_1 = 14,
|
|
|
|
SKL_DISP_PW_2,
|
2015-11-04 17:24:10 +00:00
|
|
|
|
2015-11-16 14:01:05 +00:00
|
|
|
/* Not actual bit groups. Used as IDs for lookup_power_well() */
|
2015-11-04 17:24:10 +00:00
|
|
|
SKL_DISP_PW_ALWAYS_ON,
|
2015-11-16 15:20:01 +00:00
|
|
|
SKL_DISP_PW_DC_OFF,
|
2015-02-04 13:57:44 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
#define SKL_POWER_WELL_STATE(pw) (1 << ((pw) * 2))
|
|
|
|
#define SKL_POWER_WELL_REQ(pw) (1 << (((pw) * 2) + 1))
|
|
|
|
|
2013-10-03 15:16:17 +00:00
|
|
|
#define PUNIT_REG_PWRGT_CTRL 0x60
|
|
|
|
#define PUNIT_REG_PWRGT_STATUS 0x61
|
2014-03-04 17:23:02 +00:00
|
|
|
#define PUNIT_PWRGT_MASK(power_well) (3 << ((power_well) * 2))
|
|
|
|
#define PUNIT_PWRGT_PWR_ON(power_well) (0 << ((power_well) * 2))
|
|
|
|
#define PUNIT_PWRGT_CLK_GATE(power_well) (1 << ((power_well) * 2))
|
|
|
|
#define PUNIT_PWRGT_RESET(power_well) (2 << ((power_well) * 2))
|
|
|
|
#define PUNIT_PWRGT_PWR_GATE(power_well) (3 << ((power_well) * 2))
|
2013-10-03 15:16:17 +00:00
|
|
|
|
2013-05-22 12:36:17 +00:00
|
|
|
#define PUNIT_REG_GPU_LFM 0xd3
|
|
|
|
#define PUNIT_REG_GPU_FREQ_REQ 0xd4
|
|
|
|
#define PUNIT_REG_GPU_FREQ_STS 0xd8
|
2014-11-07 19:33:44 +00:00
|
|
|
#define GPLLENABLE (1<<4)
|
2013-06-26 14:43:24 +00:00
|
|
|
#define GENFREQSTATUS (1<<0)
|
2013-05-22 12:36:17 +00:00
|
|
|
#define PUNIT_REG_MEDIA_TURBO_FREQ_REQ 0xdc
|
2014-07-03 21:33:01 +00:00
|
|
|
#define PUNIT_REG_CZ_TIMESTAMP 0xce
|
2013-05-22 12:36:17 +00:00
|
|
|
|
|
|
|
#define PUNIT_FUSE_BUS2 0xf6 /* bits 47:40 */
|
|
|
|
#define PUNIT_FUSE_BUS1 0xf5 /* bits 55:48 */
|
|
|
|
|
2015-01-17 05:35:59 +00:00
|
|
|
#define FB_GFX_FMAX_AT_VMAX_FUSE 0x136
|
|
|
|
#define FB_GFX_FREQ_FUSE_MASK 0xff
|
|
|
|
#define FB_GFX_FMAX_AT_VMAX_2SS4EU_FUSE_SHIFT 24
|
|
|
|
#define FB_GFX_FMAX_AT_VMAX_2SS6EU_FUSE_SHIFT 16
|
|
|
|
#define FB_GFX_FMAX_AT_VMAX_2SS8EU_FUSE_SHIFT 8
|
|
|
|
|
|
|
|
#define FB_GFX_FMIN_AT_VMIN_FUSE 0x137
|
|
|
|
#define FB_GFX_FMIN_AT_VMIN_FUSE_SHIFT 8
|
|
|
|
|
2015-03-05 19:19:52 +00:00
|
|
|
#define PUNIT_REG_DDR_SETUP2 0x139
|
|
|
|
#define FORCE_DDR_FREQ_REQ_ACK (1 << 8)
|
|
|
|
#define FORCE_DDR_LOW_FREQ (1 << 1)
|
|
|
|
#define FORCE_DDR_HIGH_FREQ (1 << 0)
|
|
|
|
|
2014-05-27 10:29:30 +00:00
|
|
|
#define PUNIT_GPU_STATUS_REG 0xdb
|
|
|
|
#define PUNIT_GPU_STATUS_MAX_FREQ_SHIFT 16
|
|
|
|
#define PUNIT_GPU_STATUS_MAX_FREQ_MASK 0xff
|
|
|
|
#define PUNIT_GPU_STATIS_GFX_MIN_FREQ_SHIFT 8
|
|
|
|
#define PUNIT_GPU_STATUS_GFX_MIN_FREQ_MASK 0xff
|
|
|
|
|
|
|
|
#define PUNIT_GPU_DUTYCYCLE_REG 0xdf
|
|
|
|
#define PUNIT_GPU_DUTYCYCLE_RPE_FREQ_SHIFT 8
|
|
|
|
#define PUNIT_GPU_DUTYCYCLE_RPE_FREQ_MASK 0xff
|
|
|
|
|
2013-05-22 12:36:17 +00:00
|
|
|
#define IOSF_NC_FB_GFX_FREQ_FUSE 0x1c
|
|
|
|
#define FB_GFX_MAX_FREQ_FUSE_SHIFT 3
|
|
|
|
#define FB_GFX_MAX_FREQ_FUSE_MASK 0x000007f8
|
|
|
|
#define FB_GFX_FGUARANTEED_FREQ_FUSE_SHIFT 11
|
|
|
|
#define FB_GFX_FGUARANTEED_FREQ_FUSE_MASK 0x0007f800
|
|
|
|
#define IOSF_NC_FB_GFX_FMAX_FUSE_HI 0x34
|
|
|
|
#define FB_FMAX_VMIN_FREQ_HI_MASK 0x00000007
|
|
|
|
#define IOSF_NC_FB_GFX_FMAX_FUSE_LO 0x30
|
|
|
|
#define FB_FMAX_VMIN_FREQ_LO_SHIFT 27
|
|
|
|
#define FB_FMAX_VMIN_FREQ_LO_MASK 0xf8000000
|
|
|
|
|
2015-04-29 03:06:24 +00:00
|
|
|
#define VLV_TURBO_SOC_OVERRIDE 0x04
|
|
|
|
#define VLV_OVERRIDE_EN 1
|
|
|
|
#define VLV_SOC_TDP_EN (1 << 1)
|
|
|
|
#define VLV_BIAS_CPU_125_SOC_875 (6 << 2)
|
|
|
|
#define CHV_BIAS_CPU_50_SOC_50 (3 << 2)
|
|
|
|
|
2014-07-03 21:33:01 +00:00
|
|
|
#define VLV_CZ_CLOCK_TO_MILLI_SEC 100000
|
|
|
|
|
2013-08-27 20:40:56 +00:00
|
|
|
/* vlv2 north clock has */
|
2013-09-27 07:31:00 +00:00
|
|
|
#define CCK_FUSE_REG 0x8
|
|
|
|
#define CCK_FUSE_HPLL_FREQ_MASK 0x3
|
2013-08-27 20:40:56 +00:00
|
|
|
#define CCK_REG_DSI_PLL_FUSE 0x44
|
|
|
|
#define CCK_REG_DSI_PLL_CONTROL 0x48
|
|
|
|
#define DSI_PLL_VCO_EN (1 << 31)
|
|
|
|
#define DSI_PLL_LDO_GATE (1 << 30)
|
|
|
|
#define DSI_PLL_P1_POST_DIV_SHIFT 17
|
|
|
|
#define DSI_PLL_P1_POST_DIV_MASK (0x1ff << 17)
|
|
|
|
#define DSI_PLL_P2_MUX_DSI0_DIV2 (1 << 13)
|
|
|
|
#define DSI_PLL_P3_MUX_DSI1_DIV2 (1 << 12)
|
|
|
|
#define DSI_PLL_MUX_MASK (3 << 9)
|
|
|
|
#define DSI_PLL_MUX_DSI0_DSIPLL (0 << 10)
|
|
|
|
#define DSI_PLL_MUX_DSI0_CCK (1 << 10)
|
|
|
|
#define DSI_PLL_MUX_DSI1_DSIPLL (0 << 9)
|
|
|
|
#define DSI_PLL_MUX_DSI1_CCK (1 << 9)
|
|
|
|
#define DSI_PLL_CLK_GATE_MASK (0xf << 5)
|
|
|
|
#define DSI_PLL_CLK_GATE_DSI0_DSIPLL (1 << 8)
|
|
|
|
#define DSI_PLL_CLK_GATE_DSI1_DSIPLL (1 << 7)
|
|
|
|
#define DSI_PLL_CLK_GATE_DSI0_CCK (1 << 6)
|
|
|
|
#define DSI_PLL_CLK_GATE_DSI1_CCK (1 << 5)
|
|
|
|
#define DSI_PLL_LOCK (1 << 0)
|
|
|
|
#define CCK_REG_DSI_PLL_DIVIDER 0x4c
|
|
|
|
#define DSI_PLL_LFSR (1 << 31)
|
|
|
|
#define DSI_PLL_FRACTION_EN (1 << 30)
|
|
|
|
#define DSI_PLL_FRAC_COUNTER_SHIFT 27
|
|
|
|
#define DSI_PLL_FRAC_COUNTER_MASK (7 << 27)
|
|
|
|
#define DSI_PLL_USYNC_CNT_SHIFT 18
|
|
|
|
#define DSI_PLL_USYNC_CNT_MASK (0x1ff << 18)
|
|
|
|
#define DSI_PLL_N1_DIV_SHIFT 16
|
|
|
|
#define DSI_PLL_N1_DIV_MASK (3 << 16)
|
|
|
|
#define DSI_PLL_M1_DIV_SHIFT 0
|
|
|
|
#define DSI_PLL_M1_DIV_MASK (0x1ff << 0)
|
2015-09-24 20:29:18 +00:00
|
|
|
#define CCK_CZ_CLOCK_CONTROL 0x62
|
2016-03-04 19:43:02 +00:00
|
|
|
#define CCK_GPLL_CLOCK_CONTROL 0x67
|
2013-11-04 21:48:12 +00:00
|
|
|
#define CCK_DISPLAY_CLOCK_CONTROL 0x6b
|
2016-03-02 15:22:16 +00:00
|
|
|
#define CCK_DISPLAY_REF_CLOCK_CONTROL 0x6c
|
2015-09-24 20:29:17 +00:00
|
|
|
#define CCK_TRUNK_FORCE_ON (1 << 17)
|
|
|
|
#define CCK_TRUNK_FORCE_OFF (1 << 16)
|
|
|
|
#define CCK_FREQUENCY_STATUS (0x1f << 8)
|
|
|
|
#define CCK_FREQUENCY_STATUS_SHIFT 8
|
|
|
|
#define CCK_FREQUENCY_VALUES (0x1f << 0)
|
2013-08-27 20:40:56 +00:00
|
|
|
|
2014-04-25 17:14:31 +00:00
|
|
|
/**
|
|
|
|
* DOC: DPIO
|
|
|
|
*
|
2015-03-10 19:18:30 +00:00
|
|
|
* VLV, CHV and BXT have slightly peculiar display PHYs for driving DP/HDMI
|
2014-04-25 17:14:31 +00:00
|
|
|
* ports. DPIO is the name given to such a display PHY. These PHYs
|
|
|
|
* don't follow the standard programming model using direct MMIO
|
|
|
|
* registers, and instead their registers must be accessed trough IOSF
|
|
|
|
* sideband. VLV has one such PHY for driving ports B and C, and CHV
|
|
|
|
* adds another PHY for driving port D. Each PHY responds to specific
|
|
|
|
* IOSF-SB port.
|
|
|
|
*
|
|
|
|
* Each display PHY is made up of one or two channels. Each channel
|
|
|
|
* houses a common lane part which contains the PLL and other common
|
|
|
|
* logic. CH0 common lane also contains the IOSF-SB logic for the
|
|
|
|
* Common Register Interface (CRI) ie. the DPIO registers. CRI clock
|
|
|
|
* must be running when any DPIO registers are accessed.
|
|
|
|
*
|
|
|
|
* In addition to having their own registers, the PHYs are also
|
|
|
|
* controlled through some dedicated signals from the display
|
|
|
|
* controller. These include PLL reference clock enable, PLL enable,
|
|
|
|
* and CRI clock selection, for example.
|
|
|
|
*
|
|
|
|
* Eeach channel also has two splines (also called data lanes), and
|
|
|
|
* each spline is made up of one Physical Access Coding Sub-Layer
|
|
|
|
* (PCS) block and two TX lanes. So each channel has two PCS blocks
|
|
|
|
* and four TX lanes. The TX lanes are used as DP lanes or TMDS
|
|
|
|
* data/clock pairs depending on the output type.
|
|
|
|
*
|
|
|
|
* Additionally the PHY also contains an AUX lane with AUX blocks
|
|
|
|
* for each channel. This is used for DP AUX communication, but
|
|
|
|
* this fact isn't really relevant for the driver since AUX is
|
|
|
|
* controlled from the display controller side. No DPIO registers
|
|
|
|
* need to be accessed during AUX communication,
|
|
|
|
*
|
2015-03-10 19:18:30 +00:00
|
|
|
* Generally on VLV/CHV the common lane corresponds to the pipe and
|
2014-10-20 14:53:13 +00:00
|
|
|
* the spline (PCS/TX) corresponds to the port.
|
2014-04-25 17:14:31 +00:00
|
|
|
*
|
|
|
|
* For dual channel PHY (VLV/CHV):
|
|
|
|
*
|
|
|
|
* pipe A == CMN/PLL/REF CH0
|
2013-01-24 13:29:53 +00:00
|
|
|
*
|
2014-04-25 17:14:31 +00:00
|
|
|
* pipe B == CMN/PLL/REF CH1
|
|
|
|
*
|
|
|
|
* port B == PCS/TX CH0
|
|
|
|
*
|
|
|
|
* port C == PCS/TX CH1
|
|
|
|
*
|
|
|
|
* This is especially important when we cross the streams
|
|
|
|
* ie. drive port B with pipe B, or port C with pipe A.
|
|
|
|
*
|
|
|
|
* For single channel PHY (CHV):
|
|
|
|
*
|
|
|
|
* pipe C == CMN/PLL/REF CH0
|
|
|
|
*
|
|
|
|
* port D == PCS/TX CH0
|
|
|
|
*
|
2015-03-10 19:18:30 +00:00
|
|
|
* On BXT the entire PHY channel corresponds to the port. That means
|
|
|
|
* the PLL is also now associated with the port rather than the pipe,
|
|
|
|
* and so the clock needs to be routed to the appropriate transcoder.
|
|
|
|
* Port A PLL is directly connected to transcoder EDP and port B/C
|
|
|
|
* PLLs can be routed to any transcoder A/B/C.
|
|
|
|
*
|
|
|
|
* Note: DDI0 is digital port B, DD1 is digital port C, and DDI2 is
|
2016-05-31 20:55:13 +00:00
|
|
|
* digital port D (CHV) or port A (BXT). ::
|
2013-04-18 20:01:46 +00:00
|
|
|
*
|
2015-11-25 17:07:55 +00:00
|
|
|
*
|
|
|
|
* Dual channel PHY (VLV/CHV/BXT)
|
|
|
|
* ---------------------------------
|
|
|
|
* | CH0 | CH1 |
|
|
|
|
* | CMN/PLL/REF | CMN/PLL/REF |
|
|
|
|
* |---------------|---------------| Display PHY
|
|
|
|
* | PCS01 | PCS23 | PCS01 | PCS23 |
|
|
|
|
* |-------|-------|-------|-------|
|
|
|
|
* |TX0|TX1|TX2|TX3|TX0|TX1|TX2|TX3|
|
|
|
|
* ---------------------------------
|
|
|
|
* | DDI0 | DDI1 | DP/HDMI ports
|
|
|
|
* ---------------------------------
|
|
|
|
*
|
|
|
|
* Single channel PHY (CHV/BXT)
|
|
|
|
* -----------------
|
|
|
|
* | CH0 |
|
|
|
|
* | CMN/PLL/REF |
|
|
|
|
* |---------------| Display PHY
|
|
|
|
* | PCS01 | PCS23 |
|
|
|
|
* |-------|-------|
|
|
|
|
* |TX0|TX1|TX2|TX3|
|
|
|
|
* -----------------
|
|
|
|
* | DDI2 | DP/HDMI port
|
|
|
|
* -----------------
|
2012-03-28 20:39:25 +00:00
|
|
|
*/
|
2013-05-22 12:36:17 +00:00
|
|
|
#define DPIO_DEVFN 0
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define DPIO_CTL _MMIO(VLV_DISPLAY_BASE + 0x2110)
|
2012-03-28 20:39:25 +00:00
|
|
|
#define DPIO_MODSEL1 (1<<3) /* if ref clk b == 27 */
|
|
|
|
#define DPIO_MODSEL0 (1<<2) /* if ref clk a == 27 */
|
|
|
|
#define DPIO_SFR_BYPASS (1<<1)
|
2013-10-03 18:35:46 +00:00
|
|
|
#define DPIO_CMNRST (1<<0)
|
2012-03-28 20:39:25 +00:00
|
|
|
|
2013-11-06 06:36:35 +00:00
|
|
|
#define DPIO_PHY(pipe) ((pipe) >> 1)
|
|
|
|
#define DPIO_PHY_IOSF_PORT(phy) (dev_priv->dpio_phy_iosf_port[phy])
|
|
|
|
|
2013-04-18 20:01:46 +00:00
|
|
|
/*
|
|
|
|
* Per pipe/PLL DPIO regs
|
|
|
|
*/
|
2013-11-07 02:43:30 +00:00
|
|
|
#define _VLV_PLL_DW3_CH0 0x800c
|
2012-03-28 20:39:25 +00:00
|
|
|
#define DPIO_POST_DIV_SHIFT (28) /* 3 bits */
|
2013-04-18 20:01:46 +00:00
|
|
|
#define DPIO_POST_DIV_DAC 0
|
|
|
|
#define DPIO_POST_DIV_HDMIDP 1 /* DAC 225-400M rate */
|
|
|
|
#define DPIO_POST_DIV_LVDS1 2
|
|
|
|
#define DPIO_POST_DIV_LVDS2 3
|
2012-03-28 20:39:25 +00:00
|
|
|
#define DPIO_K_SHIFT (24) /* 4 bits */
|
|
|
|
#define DPIO_P1_SHIFT (21) /* 3 bits */
|
|
|
|
#define DPIO_P2_SHIFT (16) /* 5 bits */
|
|
|
|
#define DPIO_N_SHIFT (12) /* 4 bits */
|
|
|
|
#define DPIO_ENABLE_CALIBRATION (1<<11)
|
|
|
|
#define DPIO_M1DIV_SHIFT (8) /* 3 bits */
|
|
|
|
#define DPIO_M2DIV_MASK 0xff
|
2013-11-07 02:43:30 +00:00
|
|
|
#define _VLV_PLL_DW3_CH1 0x802c
|
|
|
|
#define VLV_PLL_DW3(ch) _PIPE(ch, _VLV_PLL_DW3_CH0, _VLV_PLL_DW3_CH1)
|
2012-03-28 20:39:25 +00:00
|
|
|
|
2013-11-07 02:43:30 +00:00
|
|
|
#define _VLV_PLL_DW5_CH0 0x8014
|
2012-03-28 20:39:25 +00:00
|
|
|
#define DPIO_REFSEL_OVERRIDE 27
|
|
|
|
#define DPIO_PLL_MODESEL_SHIFT 24 /* 3 bits */
|
|
|
|
#define DPIO_BIAS_CURRENT_CTL_SHIFT 21 /* 3 bits, always 0x7 */
|
|
|
|
#define DPIO_PLL_REFCLK_SEL_SHIFT 16 /* 2 bits */
|
2012-09-27 13:43:03 +00:00
|
|
|
#define DPIO_PLL_REFCLK_SEL_MASK 3
|
2012-03-28 20:39:25 +00:00
|
|
|
#define DPIO_DRIVER_CTL_SHIFT 12 /* always set to 0x8 */
|
|
|
|
#define DPIO_CLK_BIAS_CTL_SHIFT 8 /* always set to 0x5 */
|
2013-11-07 02:43:30 +00:00
|
|
|
#define _VLV_PLL_DW5_CH1 0x8034
|
|
|
|
#define VLV_PLL_DW5(ch) _PIPE(ch, _VLV_PLL_DW5_CH0, _VLV_PLL_DW5_CH1)
|
2012-03-28 20:39:25 +00:00
|
|
|
|
2013-11-07 02:43:30 +00:00
|
|
|
#define _VLV_PLL_DW7_CH0 0x801c
|
|
|
|
#define _VLV_PLL_DW7_CH1 0x803c
|
|
|
|
#define VLV_PLL_DW7(ch) _PIPE(ch, _VLV_PLL_DW7_CH0, _VLV_PLL_DW7_CH1)
|
2012-03-28 20:39:25 +00:00
|
|
|
|
2013-11-07 02:43:30 +00:00
|
|
|
#define _VLV_PLL_DW8_CH0 0x8040
|
|
|
|
#define _VLV_PLL_DW8_CH1 0x8060
|
|
|
|
#define VLV_PLL_DW8(ch) _PIPE(ch, _VLV_PLL_DW8_CH0, _VLV_PLL_DW8_CH1)
|
2013-04-18 20:01:46 +00:00
|
|
|
|
2013-11-07 02:43:30 +00:00
|
|
|
#define VLV_PLL_DW9_BCAST 0xc044
|
|
|
|
#define _VLV_PLL_DW9_CH0 0x8044
|
|
|
|
#define _VLV_PLL_DW9_CH1 0x8064
|
|
|
|
#define VLV_PLL_DW9(ch) _PIPE(ch, _VLV_PLL_DW9_CH0, _VLV_PLL_DW9_CH1)
|
2013-04-18 20:01:46 +00:00
|
|
|
|
2013-11-07 02:43:30 +00:00
|
|
|
#define _VLV_PLL_DW10_CH0 0x8048
|
|
|
|
#define _VLV_PLL_DW10_CH1 0x8068
|
|
|
|
#define VLV_PLL_DW10(ch) _PIPE(ch, _VLV_PLL_DW10_CH0, _VLV_PLL_DW10_CH1)
|
2013-04-18 20:01:46 +00:00
|
|
|
|
2013-11-07 02:43:30 +00:00
|
|
|
#define _VLV_PLL_DW11_CH0 0x804c
|
|
|
|
#define _VLV_PLL_DW11_CH1 0x806c
|
|
|
|
#define VLV_PLL_DW11(ch) _PIPE(ch, _VLV_PLL_DW11_CH0, _VLV_PLL_DW11_CH1)
|
2012-03-28 20:39:25 +00:00
|
|
|
|
2013-11-07 02:43:30 +00:00
|
|
|
/* Spec for ref block start counts at DW10 */
|
|
|
|
#define VLV_REF_DW13 0x80ac
|
2013-04-18 20:01:46 +00:00
|
|
|
|
2013-11-07 02:43:30 +00:00
|
|
|
#define VLV_CMN_DW0 0x8100
|
2010-10-01 11:05:06 +00:00
|
|
|
|
2013-04-18 20:01:46 +00:00
|
|
|
/*
|
|
|
|
* Per DDI channel DPIO regs
|
|
|
|
*/
|
|
|
|
|
2013-11-07 02:43:30 +00:00
|
|
|
#define _VLV_PCS_DW0_CH0 0x8200
|
|
|
|
#define _VLV_PCS_DW0_CH1 0x8400
|
2013-04-18 20:01:46 +00:00
|
|
|
#define DPIO_PCS_TX_LANE2_RESET (1<<16)
|
|
|
|
#define DPIO_PCS_TX_LANE1_RESET (1<<7)
|
2014-08-18 11:42:46 +00:00
|
|
|
#define DPIO_LEFT_TXFIFO_RST_MASTER2 (1<<4)
|
|
|
|
#define DPIO_RIGHT_TXFIFO_RST_MASTER2 (1<<3)
|
2013-11-07 02:43:30 +00:00
|
|
|
#define VLV_PCS_DW0(ch) _PORT(ch, _VLV_PCS_DW0_CH0, _VLV_PCS_DW0_CH1)
|
2013-04-18 20:01:46 +00:00
|
|
|
|
2014-04-09 10:29:02 +00:00
|
|
|
#define _VLV_PCS01_DW0_CH0 0x200
|
|
|
|
#define _VLV_PCS23_DW0_CH0 0x400
|
|
|
|
#define _VLV_PCS01_DW0_CH1 0x2600
|
|
|
|
#define _VLV_PCS23_DW0_CH1 0x2800
|
|
|
|
#define VLV_PCS01_DW0(ch) _PORT(ch, _VLV_PCS01_DW0_CH0, _VLV_PCS01_DW0_CH1)
|
|
|
|
#define VLV_PCS23_DW0(ch) _PORT(ch, _VLV_PCS23_DW0_CH0, _VLV_PCS23_DW0_CH1)
|
|
|
|
|
2013-11-07 02:43:30 +00:00
|
|
|
#define _VLV_PCS_DW1_CH0 0x8204
|
|
|
|
#define _VLV_PCS_DW1_CH1 0x8404
|
2014-04-28 11:15:24 +00:00
|
|
|
#define CHV_PCS_REQ_SOFTRESET_EN (1<<23)
|
2013-04-18 20:01:46 +00:00
|
|
|
#define DPIO_PCS_CLK_CRI_RXEB_EIOS_EN (1<<22)
|
|
|
|
#define DPIO_PCS_CLK_CRI_RXDIGFILTSG_EN (1<<21)
|
|
|
|
#define DPIO_PCS_CLK_DATAWIDTH_SHIFT (6)
|
|
|
|
#define DPIO_PCS_CLK_SOFT_RESET (1<<5)
|
2013-11-07 02:43:30 +00:00
|
|
|
#define VLV_PCS_DW1(ch) _PORT(ch, _VLV_PCS_DW1_CH0, _VLV_PCS_DW1_CH1)
|
|
|
|
|
2014-04-09 10:29:02 +00:00
|
|
|
#define _VLV_PCS01_DW1_CH0 0x204
|
|
|
|
#define _VLV_PCS23_DW1_CH0 0x404
|
|
|
|
#define _VLV_PCS01_DW1_CH1 0x2604
|
|
|
|
#define _VLV_PCS23_DW1_CH1 0x2804
|
|
|
|
#define VLV_PCS01_DW1(ch) _PORT(ch, _VLV_PCS01_DW1_CH0, _VLV_PCS01_DW1_CH1)
|
|
|
|
#define VLV_PCS23_DW1(ch) _PORT(ch, _VLV_PCS23_DW1_CH0, _VLV_PCS23_DW1_CH1)
|
|
|
|
|
2013-11-07 02:43:30 +00:00
|
|
|
#define _VLV_PCS_DW8_CH0 0x8220
|
|
|
|
#define _VLV_PCS_DW8_CH1 0x8420
|
2014-04-09 10:29:05 +00:00
|
|
|
#define CHV_PCS_USEDCLKCHANNEL_OVRRIDE (1 << 20)
|
|
|
|
#define CHV_PCS_USEDCLKCHANNEL (1 << 21)
|
2013-11-07 02:43:30 +00:00
|
|
|
#define VLV_PCS_DW8(ch) _PORT(ch, _VLV_PCS_DW8_CH0, _VLV_PCS_DW8_CH1)
|
|
|
|
|
|
|
|
#define _VLV_PCS01_DW8_CH0 0x0220
|
|
|
|
#define _VLV_PCS23_DW8_CH0 0x0420
|
|
|
|
#define _VLV_PCS01_DW8_CH1 0x2620
|
|
|
|
#define _VLV_PCS23_DW8_CH1 0x2820
|
|
|
|
#define VLV_PCS01_DW8(port) _PORT(port, _VLV_PCS01_DW8_CH0, _VLV_PCS01_DW8_CH1)
|
|
|
|
#define VLV_PCS23_DW8(port) _PORT(port, _VLV_PCS23_DW8_CH0, _VLV_PCS23_DW8_CH1)
|
|
|
|
|
|
|
|
#define _VLV_PCS_DW9_CH0 0x8224
|
|
|
|
#define _VLV_PCS_DW9_CH1 0x8424
|
2014-08-18 11:42:45 +00:00
|
|
|
#define DPIO_PCS_TX2MARGIN_MASK (0x7<<13)
|
|
|
|
#define DPIO_PCS_TX2MARGIN_000 (0<<13)
|
|
|
|
#define DPIO_PCS_TX2MARGIN_101 (1<<13)
|
|
|
|
#define DPIO_PCS_TX1MARGIN_MASK (0x7<<10)
|
|
|
|
#define DPIO_PCS_TX1MARGIN_000 (0<<10)
|
|
|
|
#define DPIO_PCS_TX1MARGIN_101 (1<<10)
|
2013-11-07 02:43:30 +00:00
|
|
|
#define VLV_PCS_DW9(ch) _PORT(ch, _VLV_PCS_DW9_CH0, _VLV_PCS_DW9_CH1)
|
|
|
|
|
2014-08-18 11:42:45 +00:00
|
|
|
#define _VLV_PCS01_DW9_CH0 0x224
|
|
|
|
#define _VLV_PCS23_DW9_CH0 0x424
|
|
|
|
#define _VLV_PCS01_DW9_CH1 0x2624
|
|
|
|
#define _VLV_PCS23_DW9_CH1 0x2824
|
|
|
|
#define VLV_PCS01_DW9(ch) _PORT(ch, _VLV_PCS01_DW9_CH0, _VLV_PCS01_DW9_CH1)
|
|
|
|
#define VLV_PCS23_DW9(ch) _PORT(ch, _VLV_PCS23_DW9_CH0, _VLV_PCS23_DW9_CH1)
|
|
|
|
|
2014-05-02 11:27:47 +00:00
|
|
|
#define _CHV_PCS_DW10_CH0 0x8228
|
|
|
|
#define _CHV_PCS_DW10_CH1 0x8428
|
|
|
|
#define DPIO_PCS_SWING_CALC_TX0_TX2 (1<<30)
|
|
|
|
#define DPIO_PCS_SWING_CALC_TX1_TX3 (1<<31)
|
2014-08-18 11:42:45 +00:00
|
|
|
#define DPIO_PCS_TX2DEEMP_MASK (0xf<<24)
|
|
|
|
#define DPIO_PCS_TX2DEEMP_9P5 (0<<24)
|
|
|
|
#define DPIO_PCS_TX2DEEMP_6P0 (2<<24)
|
|
|
|
#define DPIO_PCS_TX1DEEMP_MASK (0xf<<16)
|
|
|
|
#define DPIO_PCS_TX1DEEMP_9P5 (0<<16)
|
|
|
|
#define DPIO_PCS_TX1DEEMP_6P0 (2<<16)
|
2014-05-02 11:27:47 +00:00
|
|
|
#define CHV_PCS_DW10(ch) _PORT(ch, _CHV_PCS_DW10_CH0, _CHV_PCS_DW10_CH1)
|
|
|
|
|
2014-04-09 10:29:04 +00:00
|
|
|
#define _VLV_PCS01_DW10_CH0 0x0228
|
|
|
|
#define _VLV_PCS23_DW10_CH0 0x0428
|
|
|
|
#define _VLV_PCS01_DW10_CH1 0x2628
|
|
|
|
#define _VLV_PCS23_DW10_CH1 0x2828
|
|
|
|
#define VLV_PCS01_DW10(port) _PORT(port, _VLV_PCS01_DW10_CH0, _VLV_PCS01_DW10_CH1)
|
|
|
|
#define VLV_PCS23_DW10(port) _PORT(port, _VLV_PCS23_DW10_CH0, _VLV_PCS23_DW10_CH1)
|
|
|
|
|
2013-11-07 02:43:30 +00:00
|
|
|
#define _VLV_PCS_DW11_CH0 0x822c
|
|
|
|
#define _VLV_PCS_DW11_CH1 0x842c
|
2015-04-10 15:21:27 +00:00
|
|
|
#define DPIO_TX2_STAGGER_MASK(x) ((x)<<24)
|
2014-08-18 11:42:46 +00:00
|
|
|
#define DPIO_LANEDESKEW_STRAP_OVRD (1<<3)
|
|
|
|
#define DPIO_LEFT_TXFIFO_RST_MASTER (1<<1)
|
|
|
|
#define DPIO_RIGHT_TXFIFO_RST_MASTER (1<<0)
|
2013-11-07 02:43:30 +00:00
|
|
|
#define VLV_PCS_DW11(ch) _PORT(ch, _VLV_PCS_DW11_CH0, _VLV_PCS_DW11_CH1)
|
|
|
|
|
2014-08-18 11:42:46 +00:00
|
|
|
#define _VLV_PCS01_DW11_CH0 0x022c
|
|
|
|
#define _VLV_PCS23_DW11_CH0 0x042c
|
|
|
|
#define _VLV_PCS01_DW11_CH1 0x262c
|
|
|
|
#define _VLV_PCS23_DW11_CH1 0x282c
|
2014-10-16 17:52:32 +00:00
|
|
|
#define VLV_PCS01_DW11(ch) _PORT(ch, _VLV_PCS01_DW11_CH0, _VLV_PCS01_DW11_CH1)
|
|
|
|
#define VLV_PCS23_DW11(ch) _PORT(ch, _VLV_PCS23_DW11_CH0, _VLV_PCS23_DW11_CH1)
|
2014-08-18 11:42:46 +00:00
|
|
|
|
2015-04-10 15:21:27 +00:00
|
|
|
#define _VLV_PCS01_DW12_CH0 0x0230
|
|
|
|
#define _VLV_PCS23_DW12_CH0 0x0430
|
|
|
|
#define _VLV_PCS01_DW12_CH1 0x2630
|
|
|
|
#define _VLV_PCS23_DW12_CH1 0x2830
|
|
|
|
#define VLV_PCS01_DW12(ch) _PORT(ch, _VLV_PCS01_DW12_CH0, _VLV_PCS01_DW12_CH1)
|
|
|
|
#define VLV_PCS23_DW12(ch) _PORT(ch, _VLV_PCS23_DW12_CH0, _VLV_PCS23_DW12_CH1)
|
|
|
|
|
2013-11-07 02:43:30 +00:00
|
|
|
#define _VLV_PCS_DW12_CH0 0x8230
|
|
|
|
#define _VLV_PCS_DW12_CH1 0x8430
|
2015-04-10 15:21:27 +00:00
|
|
|
#define DPIO_TX2_STAGGER_MULT(x) ((x)<<20)
|
|
|
|
#define DPIO_TX1_STAGGER_MULT(x) ((x)<<16)
|
|
|
|
#define DPIO_TX1_STAGGER_MASK(x) ((x)<<8)
|
|
|
|
#define DPIO_LANESTAGGER_STRAP_OVRD (1<<6)
|
|
|
|
#define DPIO_LANESTAGGER_STRAP(x) ((x)<<0)
|
2013-11-07 02:43:30 +00:00
|
|
|
#define VLV_PCS_DW12(ch) _PORT(ch, _VLV_PCS_DW12_CH0, _VLV_PCS_DW12_CH1)
|
|
|
|
|
|
|
|
#define _VLV_PCS_DW14_CH0 0x8238
|
|
|
|
#define _VLV_PCS_DW14_CH1 0x8438
|
|
|
|
#define VLV_PCS_DW14(ch) _PORT(ch, _VLV_PCS_DW14_CH0, _VLV_PCS_DW14_CH1)
|
|
|
|
|
|
|
|
#define _VLV_PCS_DW23_CH0 0x825c
|
|
|
|
#define _VLV_PCS_DW23_CH1 0x845c
|
|
|
|
#define VLV_PCS_DW23(ch) _PORT(ch, _VLV_PCS_DW23_CH0, _VLV_PCS_DW23_CH1)
|
|
|
|
|
|
|
|
#define _VLV_TX_DW2_CH0 0x8288
|
|
|
|
#define _VLV_TX_DW2_CH1 0x8488
|
2014-06-27 23:04:03 +00:00
|
|
|
#define DPIO_SWING_MARGIN000_SHIFT 16
|
|
|
|
#define DPIO_SWING_MARGIN000_MASK (0xff << DPIO_SWING_MARGIN000_SHIFT)
|
2014-05-02 11:27:47 +00:00
|
|
|
#define DPIO_UNIQ_TRANS_SCALE_SHIFT 8
|
2013-11-07 02:43:30 +00:00
|
|
|
#define VLV_TX_DW2(ch) _PORT(ch, _VLV_TX_DW2_CH0, _VLV_TX_DW2_CH1)
|
|
|
|
|
|
|
|
#define _VLV_TX_DW3_CH0 0x828c
|
|
|
|
#define _VLV_TX_DW3_CH1 0x848c
|
2014-05-02 11:27:47 +00:00
|
|
|
/* The following bit for CHV phy */
|
|
|
|
#define DPIO_TX_UNIQ_TRANS_SCALE_EN (1<<27)
|
2014-06-27 23:04:03 +00:00
|
|
|
#define DPIO_SWING_MARGIN101_SHIFT 16
|
|
|
|
#define DPIO_SWING_MARGIN101_MASK (0xff << DPIO_SWING_MARGIN101_SHIFT)
|
2013-11-07 02:43:30 +00:00
|
|
|
#define VLV_TX_DW3(ch) _PORT(ch, _VLV_TX_DW3_CH0, _VLV_TX_DW3_CH1)
|
|
|
|
|
|
|
|
#define _VLV_TX_DW4_CH0 0x8290
|
|
|
|
#define _VLV_TX_DW4_CH1 0x8490
|
2014-05-02 11:27:47 +00:00
|
|
|
#define DPIO_SWING_DEEMPH9P5_SHIFT 24
|
|
|
|
#define DPIO_SWING_DEEMPH9P5_MASK (0xff << DPIO_SWING_DEEMPH9P5_SHIFT)
|
2014-06-27 23:04:03 +00:00
|
|
|
#define DPIO_SWING_DEEMPH6P0_SHIFT 16
|
|
|
|
#define DPIO_SWING_DEEMPH6P0_MASK (0xff << DPIO_SWING_DEEMPH6P0_SHIFT)
|
2013-11-07 02:43:30 +00:00
|
|
|
#define VLV_TX_DW4(ch) _PORT(ch, _VLV_TX_DW4_CH0, _VLV_TX_DW4_CH1)
|
|
|
|
|
|
|
|
#define _VLV_TX3_DW4_CH0 0x690
|
|
|
|
#define _VLV_TX3_DW4_CH1 0x2a90
|
|
|
|
#define VLV_TX3_DW4(ch) _PORT(ch, _VLV_TX3_DW4_CH0, _VLV_TX3_DW4_CH1)
|
|
|
|
|
|
|
|
#define _VLV_TX_DW5_CH0 0x8294
|
|
|
|
#define _VLV_TX_DW5_CH1 0x8494
|
2013-04-18 20:01:46 +00:00
|
|
|
#define DPIO_TX_OCALINIT_EN (1<<31)
|
2013-11-07 02:43:30 +00:00
|
|
|
#define VLV_TX_DW5(ch) _PORT(ch, _VLV_TX_DW5_CH0, _VLV_TX_DW5_CH1)
|
|
|
|
|
|
|
|
#define _VLV_TX_DW11_CH0 0x82ac
|
|
|
|
#define _VLV_TX_DW11_CH1 0x84ac
|
|
|
|
#define VLV_TX_DW11(ch) _PORT(ch, _VLV_TX_DW11_CH0, _VLV_TX_DW11_CH1)
|
|
|
|
|
|
|
|
#define _VLV_TX_DW14_CH0 0x82b8
|
|
|
|
#define _VLV_TX_DW14_CH1 0x84b8
|
|
|
|
#define VLV_TX_DW14(ch) _PORT(ch, _VLV_TX_DW14_CH0, _VLV_TX_DW14_CH1)
|
2012-09-27 13:43:03 +00:00
|
|
|
|
2014-05-02 11:27:47 +00:00
|
|
|
/* CHV dpPhy registers */
|
|
|
|
#define _CHV_PLL_DW0_CH0 0x8000
|
|
|
|
#define _CHV_PLL_DW0_CH1 0x8180
|
|
|
|
#define CHV_PLL_DW0(ch) _PIPE(ch, _CHV_PLL_DW0_CH0, _CHV_PLL_DW0_CH1)
|
|
|
|
|
|
|
|
#define _CHV_PLL_DW1_CH0 0x8004
|
|
|
|
#define _CHV_PLL_DW1_CH1 0x8184
|
|
|
|
#define DPIO_CHV_N_DIV_SHIFT 8
|
|
|
|
#define DPIO_CHV_M1_DIV_BY_2 (0 << 0)
|
|
|
|
#define CHV_PLL_DW1(ch) _PIPE(ch, _CHV_PLL_DW1_CH0, _CHV_PLL_DW1_CH1)
|
|
|
|
|
|
|
|
#define _CHV_PLL_DW2_CH0 0x8008
|
|
|
|
#define _CHV_PLL_DW2_CH1 0x8188
|
|
|
|
#define CHV_PLL_DW2(ch) _PIPE(ch, _CHV_PLL_DW2_CH0, _CHV_PLL_DW2_CH1)
|
|
|
|
|
|
|
|
#define _CHV_PLL_DW3_CH0 0x800c
|
|
|
|
#define _CHV_PLL_DW3_CH1 0x818c
|
|
|
|
#define DPIO_CHV_FRAC_DIV_EN (1 << 16)
|
|
|
|
#define DPIO_CHV_FIRST_MOD (0 << 8)
|
|
|
|
#define DPIO_CHV_SECOND_MOD (1 << 8)
|
|
|
|
#define DPIO_CHV_FEEDFWD_GAIN_SHIFT 0
|
2015-03-05 14:00:57 +00:00
|
|
|
#define DPIO_CHV_FEEDFWD_GAIN_MASK (0xF << 0)
|
2014-05-02 11:27:47 +00:00
|
|
|
#define CHV_PLL_DW3(ch) _PIPE(ch, _CHV_PLL_DW3_CH0, _CHV_PLL_DW3_CH1)
|
|
|
|
|
|
|
|
#define _CHV_PLL_DW6_CH0 0x8018
|
|
|
|
#define _CHV_PLL_DW6_CH1 0x8198
|
|
|
|
#define DPIO_CHV_GAIN_CTRL_SHIFT 16
|
|
|
|
#define DPIO_CHV_INT_COEFF_SHIFT 8
|
|
|
|
#define DPIO_CHV_PROP_COEFF_SHIFT 0
|
|
|
|
#define CHV_PLL_DW6(ch) _PIPE(ch, _CHV_PLL_DW6_CH0, _CHV_PLL_DW6_CH1)
|
|
|
|
|
2015-02-16 09:37:58 +00:00
|
|
|
#define _CHV_PLL_DW8_CH0 0x8020
|
|
|
|
#define _CHV_PLL_DW8_CH1 0x81A0
|
2015-03-05 14:03:08 +00:00
|
|
|
#define DPIO_CHV_TDC_TARGET_CNT_SHIFT 0
|
|
|
|
#define DPIO_CHV_TDC_TARGET_CNT_MASK (0x3FF << 0)
|
2015-02-16 09:37:58 +00:00
|
|
|
#define CHV_PLL_DW8(ch) _PIPE(ch, _CHV_PLL_DW8_CH0, _CHV_PLL_DW8_CH1)
|
|
|
|
|
|
|
|
#define _CHV_PLL_DW9_CH0 0x8024
|
|
|
|
#define _CHV_PLL_DW9_CH1 0x81A4
|
|
|
|
#define DPIO_CHV_INT_LOCK_THRESHOLD_SHIFT 1 /* 3 bits */
|
2015-03-05 14:02:06 +00:00
|
|
|
#define DPIO_CHV_INT_LOCK_THRESHOLD_MASK (7 << 1)
|
2015-02-16 09:37:58 +00:00
|
|
|
#define DPIO_CHV_INT_LOCK_THRESHOLD_SEL_COARSE 1 /* 1: coarse & 0 : fine */
|
|
|
|
#define CHV_PLL_DW9(ch) _PIPE(ch, _CHV_PLL_DW9_CH0, _CHV_PLL_DW9_CH1)
|
|
|
|
|
2015-07-08 20:46:00 +00:00
|
|
|
#define _CHV_CMN_DW0_CH0 0x8100
|
|
|
|
#define DPIO_ALLDL_POWERDOWN_SHIFT_CH0 19
|
|
|
|
#define DPIO_ANYDL_POWERDOWN_SHIFT_CH0 18
|
|
|
|
#define DPIO_ALLDL_POWERDOWN (1 << 1)
|
|
|
|
#define DPIO_ANYDL_POWERDOWN (1 << 0)
|
|
|
|
|
2014-05-27 13:30:18 +00:00
|
|
|
#define _CHV_CMN_DW5_CH0 0x8114
|
|
|
|
#define CHV_BUFRIGHTENA1_DISABLE (0 << 20)
|
|
|
|
#define CHV_BUFRIGHTENA1_NORMAL (1 << 20)
|
|
|
|
#define CHV_BUFRIGHTENA1_FORCE (3 << 20)
|
|
|
|
#define CHV_BUFRIGHTENA1_MASK (3 << 20)
|
|
|
|
#define CHV_BUFLEFTENA1_DISABLE (0 << 22)
|
|
|
|
#define CHV_BUFLEFTENA1_NORMAL (1 << 22)
|
|
|
|
#define CHV_BUFLEFTENA1_FORCE (3 << 22)
|
|
|
|
#define CHV_BUFLEFTENA1_MASK (3 << 22)
|
|
|
|
|
2014-05-02 11:27:47 +00:00
|
|
|
#define _CHV_CMN_DW13_CH0 0x8134
|
|
|
|
#define _CHV_CMN_DW0_CH1 0x8080
|
|
|
|
#define DPIO_CHV_S1_DIV_SHIFT 21
|
|
|
|
#define DPIO_CHV_P1_DIV_SHIFT 13 /* 3 bits */
|
|
|
|
#define DPIO_CHV_P2_DIV_SHIFT 8 /* 5 bits */
|
|
|
|
#define DPIO_CHV_K_DIV_SHIFT 4
|
|
|
|
#define DPIO_PLL_FREQLOCK (1 << 1)
|
|
|
|
#define DPIO_PLL_LOCK (1 << 0)
|
|
|
|
#define CHV_CMN_DW13(ch) _PIPE(ch, _CHV_CMN_DW13_CH0, _CHV_CMN_DW0_CH1)
|
|
|
|
|
|
|
|
#define _CHV_CMN_DW14_CH0 0x8138
|
|
|
|
#define _CHV_CMN_DW1_CH1 0x8084
|
|
|
|
#define DPIO_AFC_RECAL (1 << 14)
|
|
|
|
#define DPIO_DCLKP_EN (1 << 13)
|
2014-05-27 13:30:18 +00:00
|
|
|
#define CHV_BUFLEFTENA2_DISABLE (0 << 17) /* CL2 DW1 only */
|
|
|
|
#define CHV_BUFLEFTENA2_NORMAL (1 << 17) /* CL2 DW1 only */
|
|
|
|
#define CHV_BUFLEFTENA2_FORCE (3 << 17) /* CL2 DW1 only */
|
|
|
|
#define CHV_BUFLEFTENA2_MASK (3 << 17) /* CL2 DW1 only */
|
|
|
|
#define CHV_BUFRIGHTENA2_DISABLE (0 << 19) /* CL2 DW1 only */
|
|
|
|
#define CHV_BUFRIGHTENA2_NORMAL (1 << 19) /* CL2 DW1 only */
|
|
|
|
#define CHV_BUFRIGHTENA2_FORCE (3 << 19) /* CL2 DW1 only */
|
|
|
|
#define CHV_BUFRIGHTENA2_MASK (3 << 19) /* CL2 DW1 only */
|
2014-05-02 11:27:47 +00:00
|
|
|
#define CHV_CMN_DW14(ch) _PIPE(ch, _CHV_CMN_DW14_CH0, _CHV_CMN_DW1_CH1)
|
|
|
|
|
2014-04-09 10:29:05 +00:00
|
|
|
#define _CHV_CMN_DW19_CH0 0x814c
|
|
|
|
#define _CHV_CMN_DW6_CH1 0x8098
|
2015-07-08 20:46:00 +00:00
|
|
|
#define DPIO_ALLDL_POWERDOWN_SHIFT_CH1 30 /* CL2 DW6 only */
|
|
|
|
#define DPIO_ANYDL_POWERDOWN_SHIFT_CH1 29 /* CL2 DW6 only */
|
2015-07-08 20:45:54 +00:00
|
|
|
#define DPIO_DYNPWRDOWNEN_CH1 (1 << 28) /* CL2 DW6 only */
|
2014-04-09 10:29:05 +00:00
|
|
|
#define CHV_CMN_USEDCLKCHANNEL (1 << 13)
|
2015-07-08 20:45:54 +00:00
|
|
|
|
2014-04-09 10:29:05 +00:00
|
|
|
#define CHV_CMN_DW19(ch) _PIPE(ch, _CHV_CMN_DW19_CH0, _CHV_CMN_DW6_CH1)
|
|
|
|
|
2015-07-08 20:45:54 +00:00
|
|
|
#define CHV_CMN_DW28 0x8170
|
|
|
|
#define DPIO_CL1POWERDOWNEN (1 << 23)
|
|
|
|
#define DPIO_DYNPWRDOWNEN_CH0 (1 << 22)
|
2015-07-08 20:45:57 +00:00
|
|
|
#define DPIO_SUS_CLK_CONFIG_ON (0 << 0)
|
|
|
|
#define DPIO_SUS_CLK_CONFIG_CLKREQ (1 << 0)
|
|
|
|
#define DPIO_SUS_CLK_CONFIG_GATE (2 << 0)
|
|
|
|
#define DPIO_SUS_CLK_CONFIG_GATE_CLKREQ (3 << 0)
|
2015-07-08 20:45:54 +00:00
|
|
|
|
2014-05-02 11:27:47 +00:00
|
|
|
#define CHV_CMN_DW30 0x8178
|
2015-07-08 20:45:58 +00:00
|
|
|
#define DPIO_CL2_LDOFUSE_PWRENB (1 << 6)
|
2014-05-02 11:27:47 +00:00
|
|
|
#define DPIO_LRC_BYPASS (1 << 3)
|
|
|
|
|
|
|
|
#define _TXLANE(ch, lane, offset) ((ch ? 0x2400 : 0) + \
|
|
|
|
(lane) * 0x200 + (offset))
|
|
|
|
|
2014-04-09 10:29:03 +00:00
|
|
|
#define CHV_TX_DW0(ch, lane) _TXLANE(ch, lane, 0x80)
|
|
|
|
#define CHV_TX_DW1(ch, lane) _TXLANE(ch, lane, 0x84)
|
|
|
|
#define CHV_TX_DW2(ch, lane) _TXLANE(ch, lane, 0x88)
|
|
|
|
#define CHV_TX_DW3(ch, lane) _TXLANE(ch, lane, 0x8c)
|
|
|
|
#define CHV_TX_DW4(ch, lane) _TXLANE(ch, lane, 0x90)
|
|
|
|
#define CHV_TX_DW5(ch, lane) _TXLANE(ch, lane, 0x94)
|
|
|
|
#define CHV_TX_DW6(ch, lane) _TXLANE(ch, lane, 0x98)
|
|
|
|
#define CHV_TX_DW7(ch, lane) _TXLANE(ch, lane, 0x9c)
|
|
|
|
#define CHV_TX_DW8(ch, lane) _TXLANE(ch, lane, 0xa0)
|
|
|
|
#define CHV_TX_DW9(ch, lane) _TXLANE(ch, lane, 0xa4)
|
|
|
|
#define CHV_TX_DW10(ch, lane) _TXLANE(ch, lane, 0xa8)
|
2014-05-02 11:27:47 +00:00
|
|
|
#define CHV_TX_DW11(ch, lane) _TXLANE(ch, lane, 0xac)
|
|
|
|
#define DPIO_FRC_LATENCY_SHFIT 8
|
|
|
|
#define CHV_TX_DW14(ch, lane) _TXLANE(ch, lane, 0xb8)
|
|
|
|
#define DPIO_UPAR_SHIFT 30
|
drm/i915/bxt: add display initialize/uninitialize sequence (PHY)
Add PHY specific display initialization sequence as per BSpec.
Note that the PHY initialization/uninitialization are done
at their current place only for simplicity, in a future patch - when more
of the runtime PM features will be enabled - these will be moved to
power well#1 and modeset encoder enabling/disabling hooks respectively.
The call to uninitialize the PHY during system/runtime suspend will be
added later in this patchset.
v1: Added function definitions in header files
v2: Imre's review comments addressed
- Moved CDCLK related definitions to i915_reg.h
- Removed defintions for CDCLK frequency
- Split uninit_cdclk() by adding a phy_uninit function
- Calculate freq and decimal based on input frequency
- Program SSA precharge based on input frequency
- Use wait_for 1ms instead 200us udelay for DE PLL locking
- Removed initial value for divider, freq, decimal, ratio.
- Replaced polling loops with wait_for
- Parameterized latency optim setting
- Fix the parts where DE PLL has to be disabled.
- Call CDCLK selection from mode set
v3: (imre)
- add note about the plan to move the cdclk/phy init to a better place
- take rps.hw_lock around pcode access
- fix DDI PHY timeout value
- squash in Vandana's "PORT_CL2CM_DW6_A BUN fix",
"DDI PHY programming register defn", "Do ddi_phy_init always",
- move PHY register macros next to the corresponding CHV/VLV macros
- move DE PLL register macros here from another patch since they are
used here first
- add BXT_ prefix to CDCLK flags
- s/COMMON_RESET/COMMON_RESET_DIS/ and clarify related code comments
- fix incorrect read value for the RMW of BXT_PHY_CTL_FAMILY_DDI
- fix using GT_DISPLAY_EDP_POWER_ON vs. GT_DISPLAY_DDI_POWER_ON
when powering on DDI ports
- fix incorrect port when setting BXT_PORT_TX_DW14_LN for DDI ports
- add missing masking when programming CDCLK_FREQ_DECIMAL
- add missing powering on for DDI-C port, rename OCL2_LDOFUSE_PWR_EN
to OCL2_LDOFUSE_PWR_DIS to reduce confusion
- add note about mismatch with bspec in the PORT_REF_DW6 fields
- factor out PHY init code to a new function, so we can call it for
PHY1 and PHY0, instead of open-coding the same
v4: (ville)
- split the CDCLK/PHY parts into two patches, update commit message
accordingly
- use the existing dpio_phy enum instead of adding a new one for the
same purpose
- flip the meaning of PHYs so that PHY_A is PHY1 and PHY_BC is PHY0 to
better match CHV
- s/BXT_PHY/_BXT_PHY/
- use _PIPE for _BXT_PHY instead of open-coding it
- drop _0_2_0_GTTMMADR suffix from BXT_P_CR_GT_DISP_PWRON
- define GT_DISPLAY_POWER_ON in a more standard way
- make a note that the CHV ConfigDB also disagrees about GRC_CODE field
definitions
- fix lane optimization refactoring fumble from v3
- add per PHY uninit functions to match the init counterparts
Signed-off-by: Vandana Kannan <vandana.kannan@intel.com> (v2)
Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-11-24 08:07:39 +00:00
|
|
|
|
|
|
|
/* BXT PHY registers */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define _BXT_PHY(phy, a, b) _MMIO_PIPE((phy), (a), (b))
|
drm/i915/bxt: add display initialize/uninitialize sequence (PHY)
Add PHY specific display initialization sequence as per BSpec.
Note that the PHY initialization/uninitialization are done
at their current place only for simplicity, in a future patch - when more
of the runtime PM features will be enabled - these will be moved to
power well#1 and modeset encoder enabling/disabling hooks respectively.
The call to uninitialize the PHY during system/runtime suspend will be
added later in this patchset.
v1: Added function definitions in header files
v2: Imre's review comments addressed
- Moved CDCLK related definitions to i915_reg.h
- Removed defintions for CDCLK frequency
- Split uninit_cdclk() by adding a phy_uninit function
- Calculate freq and decimal based on input frequency
- Program SSA precharge based on input frequency
- Use wait_for 1ms instead 200us udelay for DE PLL locking
- Removed initial value for divider, freq, decimal, ratio.
- Replaced polling loops with wait_for
- Parameterized latency optim setting
- Fix the parts where DE PLL has to be disabled.
- Call CDCLK selection from mode set
v3: (imre)
- add note about the plan to move the cdclk/phy init to a better place
- take rps.hw_lock around pcode access
- fix DDI PHY timeout value
- squash in Vandana's "PORT_CL2CM_DW6_A BUN fix",
"DDI PHY programming register defn", "Do ddi_phy_init always",
- move PHY register macros next to the corresponding CHV/VLV macros
- move DE PLL register macros here from another patch since they are
used here first
- add BXT_ prefix to CDCLK flags
- s/COMMON_RESET/COMMON_RESET_DIS/ and clarify related code comments
- fix incorrect read value for the RMW of BXT_PHY_CTL_FAMILY_DDI
- fix using GT_DISPLAY_EDP_POWER_ON vs. GT_DISPLAY_DDI_POWER_ON
when powering on DDI ports
- fix incorrect port when setting BXT_PORT_TX_DW14_LN for DDI ports
- add missing masking when programming CDCLK_FREQ_DECIMAL
- add missing powering on for DDI-C port, rename OCL2_LDOFUSE_PWR_EN
to OCL2_LDOFUSE_PWR_DIS to reduce confusion
- add note about mismatch with bspec in the PORT_REF_DW6 fields
- factor out PHY init code to a new function, so we can call it for
PHY1 and PHY0, instead of open-coding the same
v4: (ville)
- split the CDCLK/PHY parts into two patches, update commit message
accordingly
- use the existing dpio_phy enum instead of adding a new one for the
same purpose
- flip the meaning of PHYs so that PHY_A is PHY1 and PHY_BC is PHY0 to
better match CHV
- s/BXT_PHY/_BXT_PHY/
- use _PIPE for _BXT_PHY instead of open-coding it
- drop _0_2_0_GTTMMADR suffix from BXT_P_CR_GT_DISP_PWRON
- define GT_DISPLAY_POWER_ON in a more standard way
- make a note that the CHV ConfigDB also disagrees about GRC_CODE field
definitions
- fix lane optimization refactoring fumble from v3
- add per PHY uninit functions to match the init counterparts
Signed-off-by: Vandana Kannan <vandana.kannan@intel.com> (v2)
Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-11-24 08:07:39 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define BXT_P_CR_GT_DISP_PWRON _MMIO(0x138090)
|
drm/i915/bxt: add display initialize/uninitialize sequence (PHY)
Add PHY specific display initialization sequence as per BSpec.
Note that the PHY initialization/uninitialization are done
at their current place only for simplicity, in a future patch - when more
of the runtime PM features will be enabled - these will be moved to
power well#1 and modeset encoder enabling/disabling hooks respectively.
The call to uninitialize the PHY during system/runtime suspend will be
added later in this patchset.
v1: Added function definitions in header files
v2: Imre's review comments addressed
- Moved CDCLK related definitions to i915_reg.h
- Removed defintions for CDCLK frequency
- Split uninit_cdclk() by adding a phy_uninit function
- Calculate freq and decimal based on input frequency
- Program SSA precharge based on input frequency
- Use wait_for 1ms instead 200us udelay for DE PLL locking
- Removed initial value for divider, freq, decimal, ratio.
- Replaced polling loops with wait_for
- Parameterized latency optim setting
- Fix the parts where DE PLL has to be disabled.
- Call CDCLK selection from mode set
v3: (imre)
- add note about the plan to move the cdclk/phy init to a better place
- take rps.hw_lock around pcode access
- fix DDI PHY timeout value
- squash in Vandana's "PORT_CL2CM_DW6_A BUN fix",
"DDI PHY programming register defn", "Do ddi_phy_init always",
- move PHY register macros next to the corresponding CHV/VLV macros
- move DE PLL register macros here from another patch since they are
used here first
- add BXT_ prefix to CDCLK flags
- s/COMMON_RESET/COMMON_RESET_DIS/ and clarify related code comments
- fix incorrect read value for the RMW of BXT_PHY_CTL_FAMILY_DDI
- fix using GT_DISPLAY_EDP_POWER_ON vs. GT_DISPLAY_DDI_POWER_ON
when powering on DDI ports
- fix incorrect port when setting BXT_PORT_TX_DW14_LN for DDI ports
- add missing masking when programming CDCLK_FREQ_DECIMAL
- add missing powering on for DDI-C port, rename OCL2_LDOFUSE_PWR_EN
to OCL2_LDOFUSE_PWR_DIS to reduce confusion
- add note about mismatch with bspec in the PORT_REF_DW6 fields
- factor out PHY init code to a new function, so we can call it for
PHY1 and PHY0, instead of open-coding the same
v4: (ville)
- split the CDCLK/PHY parts into two patches, update commit message
accordingly
- use the existing dpio_phy enum instead of adding a new one for the
same purpose
- flip the meaning of PHYs so that PHY_A is PHY1 and PHY_BC is PHY0 to
better match CHV
- s/BXT_PHY/_BXT_PHY/
- use _PIPE for _BXT_PHY instead of open-coding it
- drop _0_2_0_GTTMMADR suffix from BXT_P_CR_GT_DISP_PWRON
- define GT_DISPLAY_POWER_ON in a more standard way
- make a note that the CHV ConfigDB also disagrees about GRC_CODE field
definitions
- fix lane optimization refactoring fumble from v3
- add per PHY uninit functions to match the init counterparts
Signed-off-by: Vandana Kannan <vandana.kannan@intel.com> (v2)
Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-11-24 08:07:39 +00:00
|
|
|
#define GT_DISPLAY_POWER_ON(phy) (1 << (phy))
|
|
|
|
|
|
|
|
#define _PHY_CTL_FAMILY_EDP 0x64C80
|
|
|
|
#define _PHY_CTL_FAMILY_DDI 0x64C90
|
|
|
|
#define COMMON_RESET_DIS (1 << 31)
|
|
|
|
#define BXT_PHY_CTL_FAMILY(phy) _BXT_PHY((phy), _PHY_CTL_FAMILY_DDI, \
|
|
|
|
_PHY_CTL_FAMILY_EDP)
|
|
|
|
|
2014-08-22 04:19:09 +00:00
|
|
|
/* BXT PHY PLL registers */
|
|
|
|
#define _PORT_PLL_A 0x46074
|
|
|
|
#define _PORT_PLL_B 0x46078
|
|
|
|
#define _PORT_PLL_C 0x4607c
|
|
|
|
#define PORT_PLL_ENABLE (1 << 31)
|
|
|
|
#define PORT_PLL_LOCK (1 << 30)
|
|
|
|
#define PORT_PLL_REF_SEL (1 << 27)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define BXT_PORT_PLL_ENABLE(port) _MMIO_PORT(port, _PORT_PLL_A, _PORT_PLL_B)
|
2014-08-22 04:19:09 +00:00
|
|
|
|
|
|
|
#define _PORT_PLL_EBB_0_A 0x162034
|
|
|
|
#define _PORT_PLL_EBB_0_B 0x6C034
|
|
|
|
#define _PORT_PLL_EBB_0_C 0x6C340
|
2015-06-22 20:35:52 +00:00
|
|
|
#define PORT_PLL_P1_SHIFT 13
|
|
|
|
#define PORT_PLL_P1_MASK (0x07 << PORT_PLL_P1_SHIFT)
|
|
|
|
#define PORT_PLL_P1(x) ((x) << PORT_PLL_P1_SHIFT)
|
|
|
|
#define PORT_PLL_P2_SHIFT 8
|
|
|
|
#define PORT_PLL_P2_MASK (0x1f << PORT_PLL_P2_SHIFT)
|
|
|
|
#define PORT_PLL_P2(x) ((x) << PORT_PLL_P2_SHIFT)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define BXT_PORT_PLL_EBB_0(port) _MMIO_PORT3(port, _PORT_PLL_EBB_0_A, \
|
2014-08-22 04:19:09 +00:00
|
|
|
_PORT_PLL_EBB_0_B, \
|
|
|
|
_PORT_PLL_EBB_0_C)
|
|
|
|
|
|
|
|
#define _PORT_PLL_EBB_4_A 0x162038
|
|
|
|
#define _PORT_PLL_EBB_4_B 0x6C038
|
|
|
|
#define _PORT_PLL_EBB_4_C 0x6C344
|
|
|
|
#define PORT_PLL_10BIT_CLK_ENABLE (1 << 13)
|
|
|
|
#define PORT_PLL_RECALIBRATE (1 << 14)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define BXT_PORT_PLL_EBB_4(port) _MMIO_PORT3(port, _PORT_PLL_EBB_4_A, \
|
2014-08-22 04:19:09 +00:00
|
|
|
_PORT_PLL_EBB_4_B, \
|
|
|
|
_PORT_PLL_EBB_4_C)
|
|
|
|
|
|
|
|
#define _PORT_PLL_0_A 0x162100
|
|
|
|
#define _PORT_PLL_0_B 0x6C100
|
|
|
|
#define _PORT_PLL_0_C 0x6C380
|
|
|
|
/* PORT_PLL_0_A */
|
|
|
|
#define PORT_PLL_M2_MASK 0xFF
|
|
|
|
/* PORT_PLL_1_A */
|
2015-06-22 20:35:52 +00:00
|
|
|
#define PORT_PLL_N_SHIFT 8
|
|
|
|
#define PORT_PLL_N_MASK (0x0F << PORT_PLL_N_SHIFT)
|
|
|
|
#define PORT_PLL_N(x) ((x) << PORT_PLL_N_SHIFT)
|
2014-08-22 04:19:09 +00:00
|
|
|
/* PORT_PLL_2_A */
|
|
|
|
#define PORT_PLL_M2_FRAC_MASK 0x3FFFFF
|
|
|
|
/* PORT_PLL_3_A */
|
|
|
|
#define PORT_PLL_M2_FRAC_ENABLE (1 << 16)
|
|
|
|
/* PORT_PLL_6_A */
|
|
|
|
#define PORT_PLL_PROP_COEFF_MASK 0xF
|
|
|
|
#define PORT_PLL_INT_COEFF_MASK (0x1F << 8)
|
|
|
|
#define PORT_PLL_INT_COEFF(x) ((x) << 8)
|
|
|
|
#define PORT_PLL_GAIN_CTL_MASK (0x07 << 16)
|
|
|
|
#define PORT_PLL_GAIN_CTL(x) ((x) << 16)
|
|
|
|
/* PORT_PLL_8_A */
|
|
|
|
#define PORT_PLL_TARGET_CNT_MASK 0x3FF
|
2015-05-13 06:48:52 +00:00
|
|
|
/* PORT_PLL_9_A */
|
2015-06-18 14:25:54 +00:00
|
|
|
#define PORT_PLL_LOCK_THRESHOLD_SHIFT 1
|
|
|
|
#define PORT_PLL_LOCK_THRESHOLD_MASK (0x7 << PORT_PLL_LOCK_THRESHOLD_SHIFT)
|
2015-05-13 06:48:52 +00:00
|
|
|
/* PORT_PLL_10_A */
|
|
|
|
#define PORT_PLL_DCO_AMP_OVR_EN_H (1<<27)
|
2015-07-01 11:32:57 +00:00
|
|
|
#define PORT_PLL_DCO_AMP_DEFAULT 15
|
2015-05-13 06:48:52 +00:00
|
|
|
#define PORT_PLL_DCO_AMP_MASK 0x3c00
|
2015-09-18 17:03:39 +00:00
|
|
|
#define PORT_PLL_DCO_AMP(x) ((x)<<10)
|
2014-08-22 04:19:09 +00:00
|
|
|
#define _PORT_PLL_BASE(port) _PORT3(port, _PORT_PLL_0_A, \
|
|
|
|
_PORT_PLL_0_B, \
|
|
|
|
_PORT_PLL_0_C)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define BXT_PORT_PLL(port, idx) _MMIO(_PORT_PLL_BASE(port) + (idx) * 4)
|
2014-08-22 04:19:09 +00:00
|
|
|
|
drm/i915/bxt: add display initialize/uninitialize sequence (PHY)
Add PHY specific display initialization sequence as per BSpec.
Note that the PHY initialization/uninitialization are done
at their current place only for simplicity, in a future patch - when more
of the runtime PM features will be enabled - these will be moved to
power well#1 and modeset encoder enabling/disabling hooks respectively.
The call to uninitialize the PHY during system/runtime suspend will be
added later in this patchset.
v1: Added function definitions in header files
v2: Imre's review comments addressed
- Moved CDCLK related definitions to i915_reg.h
- Removed defintions for CDCLK frequency
- Split uninit_cdclk() by adding a phy_uninit function
- Calculate freq and decimal based on input frequency
- Program SSA precharge based on input frequency
- Use wait_for 1ms instead 200us udelay for DE PLL locking
- Removed initial value for divider, freq, decimal, ratio.
- Replaced polling loops with wait_for
- Parameterized latency optim setting
- Fix the parts where DE PLL has to be disabled.
- Call CDCLK selection from mode set
v3: (imre)
- add note about the plan to move the cdclk/phy init to a better place
- take rps.hw_lock around pcode access
- fix DDI PHY timeout value
- squash in Vandana's "PORT_CL2CM_DW6_A BUN fix",
"DDI PHY programming register defn", "Do ddi_phy_init always",
- move PHY register macros next to the corresponding CHV/VLV macros
- move DE PLL register macros here from another patch since they are
used here first
- add BXT_ prefix to CDCLK flags
- s/COMMON_RESET/COMMON_RESET_DIS/ and clarify related code comments
- fix incorrect read value for the RMW of BXT_PHY_CTL_FAMILY_DDI
- fix using GT_DISPLAY_EDP_POWER_ON vs. GT_DISPLAY_DDI_POWER_ON
when powering on DDI ports
- fix incorrect port when setting BXT_PORT_TX_DW14_LN for DDI ports
- add missing masking when programming CDCLK_FREQ_DECIMAL
- add missing powering on for DDI-C port, rename OCL2_LDOFUSE_PWR_EN
to OCL2_LDOFUSE_PWR_DIS to reduce confusion
- add note about mismatch with bspec in the PORT_REF_DW6 fields
- factor out PHY init code to a new function, so we can call it for
PHY1 and PHY0, instead of open-coding the same
v4: (ville)
- split the CDCLK/PHY parts into two patches, update commit message
accordingly
- use the existing dpio_phy enum instead of adding a new one for the
same purpose
- flip the meaning of PHYs so that PHY_A is PHY1 and PHY_BC is PHY0 to
better match CHV
- s/BXT_PHY/_BXT_PHY/
- use _PIPE for _BXT_PHY instead of open-coding it
- drop _0_2_0_GTTMMADR suffix from BXT_P_CR_GT_DISP_PWRON
- define GT_DISPLAY_POWER_ON in a more standard way
- make a note that the CHV ConfigDB also disagrees about GRC_CODE field
definitions
- fix lane optimization refactoring fumble from v3
- add per PHY uninit functions to match the init counterparts
Signed-off-by: Vandana Kannan <vandana.kannan@intel.com> (v2)
Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-11-24 08:07:39 +00:00
|
|
|
/* BXT PHY common lane registers */
|
|
|
|
#define _PORT_CL1CM_DW0_A 0x162000
|
|
|
|
#define _PORT_CL1CM_DW0_BC 0x6C000
|
|
|
|
#define PHY_POWER_GOOD (1 << 16)
|
2016-03-31 17:45:54 +00:00
|
|
|
#define PHY_RESERVED (1 << 7)
|
drm/i915/bxt: add display initialize/uninitialize sequence (PHY)
Add PHY specific display initialization sequence as per BSpec.
Note that the PHY initialization/uninitialization are done
at their current place only for simplicity, in a future patch - when more
of the runtime PM features will be enabled - these will be moved to
power well#1 and modeset encoder enabling/disabling hooks respectively.
The call to uninitialize the PHY during system/runtime suspend will be
added later in this patchset.
v1: Added function definitions in header files
v2: Imre's review comments addressed
- Moved CDCLK related definitions to i915_reg.h
- Removed defintions for CDCLK frequency
- Split uninit_cdclk() by adding a phy_uninit function
- Calculate freq and decimal based on input frequency
- Program SSA precharge based on input frequency
- Use wait_for 1ms instead 200us udelay for DE PLL locking
- Removed initial value for divider, freq, decimal, ratio.
- Replaced polling loops with wait_for
- Parameterized latency optim setting
- Fix the parts where DE PLL has to be disabled.
- Call CDCLK selection from mode set
v3: (imre)
- add note about the plan to move the cdclk/phy init to a better place
- take rps.hw_lock around pcode access
- fix DDI PHY timeout value
- squash in Vandana's "PORT_CL2CM_DW6_A BUN fix",
"DDI PHY programming register defn", "Do ddi_phy_init always",
- move PHY register macros next to the corresponding CHV/VLV macros
- move DE PLL register macros here from another patch since they are
used here first
- add BXT_ prefix to CDCLK flags
- s/COMMON_RESET/COMMON_RESET_DIS/ and clarify related code comments
- fix incorrect read value for the RMW of BXT_PHY_CTL_FAMILY_DDI
- fix using GT_DISPLAY_EDP_POWER_ON vs. GT_DISPLAY_DDI_POWER_ON
when powering on DDI ports
- fix incorrect port when setting BXT_PORT_TX_DW14_LN for DDI ports
- add missing masking when programming CDCLK_FREQ_DECIMAL
- add missing powering on for DDI-C port, rename OCL2_LDOFUSE_PWR_EN
to OCL2_LDOFUSE_PWR_DIS to reduce confusion
- add note about mismatch with bspec in the PORT_REF_DW6 fields
- factor out PHY init code to a new function, so we can call it for
PHY1 and PHY0, instead of open-coding the same
v4: (ville)
- split the CDCLK/PHY parts into two patches, update commit message
accordingly
- use the existing dpio_phy enum instead of adding a new one for the
same purpose
- flip the meaning of PHYs so that PHY_A is PHY1 and PHY_BC is PHY0 to
better match CHV
- s/BXT_PHY/_BXT_PHY/
- use _PIPE for _BXT_PHY instead of open-coding it
- drop _0_2_0_GTTMMADR suffix from BXT_P_CR_GT_DISP_PWRON
- define GT_DISPLAY_POWER_ON in a more standard way
- make a note that the CHV ConfigDB also disagrees about GRC_CODE field
definitions
- fix lane optimization refactoring fumble from v3
- add per PHY uninit functions to match the init counterparts
Signed-off-by: Vandana Kannan <vandana.kannan@intel.com> (v2)
Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-11-24 08:07:39 +00:00
|
|
|
#define BXT_PORT_CL1CM_DW0(phy) _BXT_PHY((phy), _PORT_CL1CM_DW0_BC, \
|
|
|
|
_PORT_CL1CM_DW0_A)
|
|
|
|
|
|
|
|
#define _PORT_CL1CM_DW9_A 0x162024
|
|
|
|
#define _PORT_CL1CM_DW9_BC 0x6C024
|
|
|
|
#define IREF0RC_OFFSET_SHIFT 8
|
|
|
|
#define IREF0RC_OFFSET_MASK (0xFF << IREF0RC_OFFSET_SHIFT)
|
|
|
|
#define BXT_PORT_CL1CM_DW9(phy) _BXT_PHY((phy), _PORT_CL1CM_DW9_BC, \
|
|
|
|
_PORT_CL1CM_DW9_A)
|
|
|
|
|
|
|
|
#define _PORT_CL1CM_DW10_A 0x162028
|
|
|
|
#define _PORT_CL1CM_DW10_BC 0x6C028
|
|
|
|
#define IREF1RC_OFFSET_SHIFT 8
|
|
|
|
#define IREF1RC_OFFSET_MASK (0xFF << IREF1RC_OFFSET_SHIFT)
|
|
|
|
#define BXT_PORT_CL1CM_DW10(phy) _BXT_PHY((phy), _PORT_CL1CM_DW10_BC, \
|
|
|
|
_PORT_CL1CM_DW10_A)
|
|
|
|
|
|
|
|
#define _PORT_CL1CM_DW28_A 0x162070
|
|
|
|
#define _PORT_CL1CM_DW28_BC 0x6C070
|
|
|
|
#define OCL1_POWER_DOWN_EN (1 << 23)
|
|
|
|
#define DW28_OLDO_DYN_PWR_DOWN_EN (1 << 22)
|
|
|
|
#define SUS_CLK_CONFIG 0x3
|
|
|
|
#define BXT_PORT_CL1CM_DW28(phy) _BXT_PHY((phy), _PORT_CL1CM_DW28_BC, \
|
|
|
|
_PORT_CL1CM_DW28_A)
|
|
|
|
|
|
|
|
#define _PORT_CL1CM_DW30_A 0x162078
|
|
|
|
#define _PORT_CL1CM_DW30_BC 0x6C078
|
|
|
|
#define OCL2_LDOFUSE_PWR_DIS (1 << 6)
|
|
|
|
#define BXT_PORT_CL1CM_DW30(phy) _BXT_PHY((phy), _PORT_CL1CM_DW30_BC, \
|
|
|
|
_PORT_CL1CM_DW30_A)
|
|
|
|
|
|
|
|
/* Defined for PHY0 only */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define BXT_PORT_CL2CM_DW6_BC _MMIO(0x6C358)
|
drm/i915/bxt: add display initialize/uninitialize sequence (PHY)
Add PHY specific display initialization sequence as per BSpec.
Note that the PHY initialization/uninitialization are done
at their current place only for simplicity, in a future patch - when more
of the runtime PM features will be enabled - these will be moved to
power well#1 and modeset encoder enabling/disabling hooks respectively.
The call to uninitialize the PHY during system/runtime suspend will be
added later in this patchset.
v1: Added function definitions in header files
v2: Imre's review comments addressed
- Moved CDCLK related definitions to i915_reg.h
- Removed defintions for CDCLK frequency
- Split uninit_cdclk() by adding a phy_uninit function
- Calculate freq and decimal based on input frequency
- Program SSA precharge based on input frequency
- Use wait_for 1ms instead 200us udelay for DE PLL locking
- Removed initial value for divider, freq, decimal, ratio.
- Replaced polling loops with wait_for
- Parameterized latency optim setting
- Fix the parts where DE PLL has to be disabled.
- Call CDCLK selection from mode set
v3: (imre)
- add note about the plan to move the cdclk/phy init to a better place
- take rps.hw_lock around pcode access
- fix DDI PHY timeout value
- squash in Vandana's "PORT_CL2CM_DW6_A BUN fix",
"DDI PHY programming register defn", "Do ddi_phy_init always",
- move PHY register macros next to the corresponding CHV/VLV macros
- move DE PLL register macros here from another patch since they are
used here first
- add BXT_ prefix to CDCLK flags
- s/COMMON_RESET/COMMON_RESET_DIS/ and clarify related code comments
- fix incorrect read value for the RMW of BXT_PHY_CTL_FAMILY_DDI
- fix using GT_DISPLAY_EDP_POWER_ON vs. GT_DISPLAY_DDI_POWER_ON
when powering on DDI ports
- fix incorrect port when setting BXT_PORT_TX_DW14_LN for DDI ports
- add missing masking when programming CDCLK_FREQ_DECIMAL
- add missing powering on for DDI-C port, rename OCL2_LDOFUSE_PWR_EN
to OCL2_LDOFUSE_PWR_DIS to reduce confusion
- add note about mismatch with bspec in the PORT_REF_DW6 fields
- factor out PHY init code to a new function, so we can call it for
PHY1 and PHY0, instead of open-coding the same
v4: (ville)
- split the CDCLK/PHY parts into two patches, update commit message
accordingly
- use the existing dpio_phy enum instead of adding a new one for the
same purpose
- flip the meaning of PHYs so that PHY_A is PHY1 and PHY_BC is PHY0 to
better match CHV
- s/BXT_PHY/_BXT_PHY/
- use _PIPE for _BXT_PHY instead of open-coding it
- drop _0_2_0_GTTMMADR suffix from BXT_P_CR_GT_DISP_PWRON
- define GT_DISPLAY_POWER_ON in a more standard way
- make a note that the CHV ConfigDB also disagrees about GRC_CODE field
definitions
- fix lane optimization refactoring fumble from v3
- add per PHY uninit functions to match the init counterparts
Signed-off-by: Vandana Kannan <vandana.kannan@intel.com> (v2)
Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-11-24 08:07:39 +00:00
|
|
|
#define DW6_OLDO_DYN_PWR_DOWN_EN (1 << 28)
|
|
|
|
|
|
|
|
/* BXT PHY Ref registers */
|
|
|
|
#define _PORT_REF_DW3_A 0x16218C
|
|
|
|
#define _PORT_REF_DW3_BC 0x6C18C
|
|
|
|
#define GRC_DONE (1 << 22)
|
|
|
|
#define BXT_PORT_REF_DW3(phy) _BXT_PHY((phy), _PORT_REF_DW3_BC, \
|
|
|
|
_PORT_REF_DW3_A)
|
|
|
|
|
|
|
|
#define _PORT_REF_DW6_A 0x162198
|
|
|
|
#define _PORT_REF_DW6_BC 0x6C198
|
2016-04-01 13:02:33 +00:00
|
|
|
#define GRC_CODE_SHIFT 24
|
|
|
|
#define GRC_CODE_MASK (0xFF << GRC_CODE_SHIFT)
|
drm/i915/bxt: add display initialize/uninitialize sequence (PHY)
Add PHY specific display initialization sequence as per BSpec.
Note that the PHY initialization/uninitialization are done
at their current place only for simplicity, in a future patch - when more
of the runtime PM features will be enabled - these will be moved to
power well#1 and modeset encoder enabling/disabling hooks respectively.
The call to uninitialize the PHY during system/runtime suspend will be
added later in this patchset.
v1: Added function definitions in header files
v2: Imre's review comments addressed
- Moved CDCLK related definitions to i915_reg.h
- Removed defintions for CDCLK frequency
- Split uninit_cdclk() by adding a phy_uninit function
- Calculate freq and decimal based on input frequency
- Program SSA precharge based on input frequency
- Use wait_for 1ms instead 200us udelay for DE PLL locking
- Removed initial value for divider, freq, decimal, ratio.
- Replaced polling loops with wait_for
- Parameterized latency optim setting
- Fix the parts where DE PLL has to be disabled.
- Call CDCLK selection from mode set
v3: (imre)
- add note about the plan to move the cdclk/phy init to a better place
- take rps.hw_lock around pcode access
- fix DDI PHY timeout value
- squash in Vandana's "PORT_CL2CM_DW6_A BUN fix",
"DDI PHY programming register defn", "Do ddi_phy_init always",
- move PHY register macros next to the corresponding CHV/VLV macros
- move DE PLL register macros here from another patch since they are
used here first
- add BXT_ prefix to CDCLK flags
- s/COMMON_RESET/COMMON_RESET_DIS/ and clarify related code comments
- fix incorrect read value for the RMW of BXT_PHY_CTL_FAMILY_DDI
- fix using GT_DISPLAY_EDP_POWER_ON vs. GT_DISPLAY_DDI_POWER_ON
when powering on DDI ports
- fix incorrect port when setting BXT_PORT_TX_DW14_LN for DDI ports
- add missing masking when programming CDCLK_FREQ_DECIMAL
- add missing powering on for DDI-C port, rename OCL2_LDOFUSE_PWR_EN
to OCL2_LDOFUSE_PWR_DIS to reduce confusion
- add note about mismatch with bspec in the PORT_REF_DW6 fields
- factor out PHY init code to a new function, so we can call it for
PHY1 and PHY0, instead of open-coding the same
v4: (ville)
- split the CDCLK/PHY parts into two patches, update commit message
accordingly
- use the existing dpio_phy enum instead of adding a new one for the
same purpose
- flip the meaning of PHYs so that PHY_A is PHY1 and PHY_BC is PHY0 to
better match CHV
- s/BXT_PHY/_BXT_PHY/
- use _PIPE for _BXT_PHY instead of open-coding it
- drop _0_2_0_GTTMMADR suffix from BXT_P_CR_GT_DISP_PWRON
- define GT_DISPLAY_POWER_ON in a more standard way
- make a note that the CHV ConfigDB also disagrees about GRC_CODE field
definitions
- fix lane optimization refactoring fumble from v3
- add per PHY uninit functions to match the init counterparts
Signed-off-by: Vandana Kannan <vandana.kannan@intel.com> (v2)
Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-11-24 08:07:39 +00:00
|
|
|
#define GRC_CODE_FAST_SHIFT 16
|
2016-04-01 13:02:33 +00:00
|
|
|
#define GRC_CODE_FAST_MASK (0xFF << GRC_CODE_FAST_SHIFT)
|
drm/i915/bxt: add display initialize/uninitialize sequence (PHY)
Add PHY specific display initialization sequence as per BSpec.
Note that the PHY initialization/uninitialization are done
at their current place only for simplicity, in a future patch - when more
of the runtime PM features will be enabled - these will be moved to
power well#1 and modeset encoder enabling/disabling hooks respectively.
The call to uninitialize the PHY during system/runtime suspend will be
added later in this patchset.
v1: Added function definitions in header files
v2: Imre's review comments addressed
- Moved CDCLK related definitions to i915_reg.h
- Removed defintions for CDCLK frequency
- Split uninit_cdclk() by adding a phy_uninit function
- Calculate freq and decimal based on input frequency
- Program SSA precharge based on input frequency
- Use wait_for 1ms instead 200us udelay for DE PLL locking
- Removed initial value for divider, freq, decimal, ratio.
- Replaced polling loops with wait_for
- Parameterized latency optim setting
- Fix the parts where DE PLL has to be disabled.
- Call CDCLK selection from mode set
v3: (imre)
- add note about the plan to move the cdclk/phy init to a better place
- take rps.hw_lock around pcode access
- fix DDI PHY timeout value
- squash in Vandana's "PORT_CL2CM_DW6_A BUN fix",
"DDI PHY programming register defn", "Do ddi_phy_init always",
- move PHY register macros next to the corresponding CHV/VLV macros
- move DE PLL register macros here from another patch since they are
used here first
- add BXT_ prefix to CDCLK flags
- s/COMMON_RESET/COMMON_RESET_DIS/ and clarify related code comments
- fix incorrect read value for the RMW of BXT_PHY_CTL_FAMILY_DDI
- fix using GT_DISPLAY_EDP_POWER_ON vs. GT_DISPLAY_DDI_POWER_ON
when powering on DDI ports
- fix incorrect port when setting BXT_PORT_TX_DW14_LN for DDI ports
- add missing masking when programming CDCLK_FREQ_DECIMAL
- add missing powering on for DDI-C port, rename OCL2_LDOFUSE_PWR_EN
to OCL2_LDOFUSE_PWR_DIS to reduce confusion
- add note about mismatch with bspec in the PORT_REF_DW6 fields
- factor out PHY init code to a new function, so we can call it for
PHY1 and PHY0, instead of open-coding the same
v4: (ville)
- split the CDCLK/PHY parts into two patches, update commit message
accordingly
- use the existing dpio_phy enum instead of adding a new one for the
same purpose
- flip the meaning of PHYs so that PHY_A is PHY1 and PHY_BC is PHY0 to
better match CHV
- s/BXT_PHY/_BXT_PHY/
- use _PIPE for _BXT_PHY instead of open-coding it
- drop _0_2_0_GTTMMADR suffix from BXT_P_CR_GT_DISP_PWRON
- define GT_DISPLAY_POWER_ON in a more standard way
- make a note that the CHV ConfigDB also disagrees about GRC_CODE field
definitions
- fix lane optimization refactoring fumble from v3
- add per PHY uninit functions to match the init counterparts
Signed-off-by: Vandana Kannan <vandana.kannan@intel.com> (v2)
Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-11-24 08:07:39 +00:00
|
|
|
#define GRC_CODE_SLOW_SHIFT 8
|
|
|
|
#define GRC_CODE_SLOW_MASK (0xFF << GRC_CODE_SLOW_SHIFT)
|
|
|
|
#define GRC_CODE_NOM_MASK 0xFF
|
|
|
|
#define BXT_PORT_REF_DW6(phy) _BXT_PHY((phy), _PORT_REF_DW6_BC, \
|
|
|
|
_PORT_REF_DW6_A)
|
|
|
|
|
|
|
|
#define _PORT_REF_DW8_A 0x1621A0
|
|
|
|
#define _PORT_REF_DW8_BC 0x6C1A0
|
|
|
|
#define GRC_DIS (1 << 15)
|
|
|
|
#define GRC_RDY_OVRD (1 << 1)
|
|
|
|
#define BXT_PORT_REF_DW8(phy) _BXT_PHY((phy), _PORT_REF_DW8_BC, \
|
|
|
|
_PORT_REF_DW8_A)
|
|
|
|
|
2014-08-22 04:19:09 +00:00
|
|
|
/* BXT PHY PCS registers */
|
2014-11-18 10:15:27 +00:00
|
|
|
#define _PORT_PCS_DW10_LN01_A 0x162428
|
|
|
|
#define _PORT_PCS_DW10_LN01_B 0x6C428
|
|
|
|
#define _PORT_PCS_DW10_LN01_C 0x6C828
|
|
|
|
#define _PORT_PCS_DW10_GRP_A 0x162C28
|
|
|
|
#define _PORT_PCS_DW10_GRP_B 0x6CC28
|
|
|
|
#define _PORT_PCS_DW10_GRP_C 0x6CE28
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define BXT_PORT_PCS_DW10_LN01(port) _MMIO_PORT3(port, _PORT_PCS_DW10_LN01_A, \
|
2014-11-18 10:15:27 +00:00
|
|
|
_PORT_PCS_DW10_LN01_B, \
|
|
|
|
_PORT_PCS_DW10_LN01_C)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define BXT_PORT_PCS_DW10_GRP(port) _MMIO_PORT3(port, _PORT_PCS_DW10_GRP_A, \
|
2014-11-18 10:15:27 +00:00
|
|
|
_PORT_PCS_DW10_GRP_B, \
|
|
|
|
_PORT_PCS_DW10_GRP_C)
|
|
|
|
#define TX2_SWING_CALC_INIT (1 << 31)
|
|
|
|
#define TX1_SWING_CALC_INIT (1 << 30)
|
|
|
|
|
2014-08-22 04:19:09 +00:00
|
|
|
#define _PORT_PCS_DW12_LN01_A 0x162430
|
|
|
|
#define _PORT_PCS_DW12_LN01_B 0x6C430
|
|
|
|
#define _PORT_PCS_DW12_LN01_C 0x6C830
|
|
|
|
#define _PORT_PCS_DW12_LN23_A 0x162630
|
|
|
|
#define _PORT_PCS_DW12_LN23_B 0x6C630
|
|
|
|
#define _PORT_PCS_DW12_LN23_C 0x6CA30
|
|
|
|
#define _PORT_PCS_DW12_GRP_A 0x162c30
|
|
|
|
#define _PORT_PCS_DW12_GRP_B 0x6CC30
|
|
|
|
#define _PORT_PCS_DW12_GRP_C 0x6CE30
|
|
|
|
#define LANESTAGGER_STRAP_OVRD (1 << 6)
|
|
|
|
#define LANE_STAGGER_MASK 0x1F
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define BXT_PORT_PCS_DW12_LN01(port) _MMIO_PORT3(port, _PORT_PCS_DW12_LN01_A, \
|
2014-08-22 04:19:09 +00:00
|
|
|
_PORT_PCS_DW12_LN01_B, \
|
|
|
|
_PORT_PCS_DW12_LN01_C)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define BXT_PORT_PCS_DW12_LN23(port) _MMIO_PORT3(port, _PORT_PCS_DW12_LN23_A, \
|
2014-08-22 04:19:09 +00:00
|
|
|
_PORT_PCS_DW12_LN23_B, \
|
|
|
|
_PORT_PCS_DW12_LN23_C)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define BXT_PORT_PCS_DW12_GRP(port) _MMIO_PORT3(port, _PORT_PCS_DW12_GRP_A, \
|
2014-08-22 04:19:09 +00:00
|
|
|
_PORT_PCS_DW12_GRP_B, \
|
|
|
|
_PORT_PCS_DW12_GRP_C)
|
|
|
|
|
drm/i915/bxt: add display initialize/uninitialize sequence (PHY)
Add PHY specific display initialization sequence as per BSpec.
Note that the PHY initialization/uninitialization are done
at their current place only for simplicity, in a future patch - when more
of the runtime PM features will be enabled - these will be moved to
power well#1 and modeset encoder enabling/disabling hooks respectively.
The call to uninitialize the PHY during system/runtime suspend will be
added later in this patchset.
v1: Added function definitions in header files
v2: Imre's review comments addressed
- Moved CDCLK related definitions to i915_reg.h
- Removed defintions for CDCLK frequency
- Split uninit_cdclk() by adding a phy_uninit function
- Calculate freq and decimal based on input frequency
- Program SSA precharge based on input frequency
- Use wait_for 1ms instead 200us udelay for DE PLL locking
- Removed initial value for divider, freq, decimal, ratio.
- Replaced polling loops with wait_for
- Parameterized latency optim setting
- Fix the parts where DE PLL has to be disabled.
- Call CDCLK selection from mode set
v3: (imre)
- add note about the plan to move the cdclk/phy init to a better place
- take rps.hw_lock around pcode access
- fix DDI PHY timeout value
- squash in Vandana's "PORT_CL2CM_DW6_A BUN fix",
"DDI PHY programming register defn", "Do ddi_phy_init always",
- move PHY register macros next to the corresponding CHV/VLV macros
- move DE PLL register macros here from another patch since they are
used here first
- add BXT_ prefix to CDCLK flags
- s/COMMON_RESET/COMMON_RESET_DIS/ and clarify related code comments
- fix incorrect read value for the RMW of BXT_PHY_CTL_FAMILY_DDI
- fix using GT_DISPLAY_EDP_POWER_ON vs. GT_DISPLAY_DDI_POWER_ON
when powering on DDI ports
- fix incorrect port when setting BXT_PORT_TX_DW14_LN for DDI ports
- add missing masking when programming CDCLK_FREQ_DECIMAL
- add missing powering on for DDI-C port, rename OCL2_LDOFUSE_PWR_EN
to OCL2_LDOFUSE_PWR_DIS to reduce confusion
- add note about mismatch with bspec in the PORT_REF_DW6 fields
- factor out PHY init code to a new function, so we can call it for
PHY1 and PHY0, instead of open-coding the same
v4: (ville)
- split the CDCLK/PHY parts into two patches, update commit message
accordingly
- use the existing dpio_phy enum instead of adding a new one for the
same purpose
- flip the meaning of PHYs so that PHY_A is PHY1 and PHY_BC is PHY0 to
better match CHV
- s/BXT_PHY/_BXT_PHY/
- use _PIPE for _BXT_PHY instead of open-coding it
- drop _0_2_0_GTTMMADR suffix from BXT_P_CR_GT_DISP_PWRON
- define GT_DISPLAY_POWER_ON in a more standard way
- make a note that the CHV ConfigDB also disagrees about GRC_CODE field
definitions
- fix lane optimization refactoring fumble from v3
- add per PHY uninit functions to match the init counterparts
Signed-off-by: Vandana Kannan <vandana.kannan@intel.com> (v2)
Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-11-24 08:07:39 +00:00
|
|
|
/* BXT PHY TX registers */
|
|
|
|
#define _BXT_LANE_OFFSET(lane) (((lane) >> 1) * 0x200 + \
|
|
|
|
((lane) & 1) * 0x80)
|
|
|
|
|
2014-11-18 10:15:27 +00:00
|
|
|
#define _PORT_TX_DW2_LN0_A 0x162508
|
|
|
|
#define _PORT_TX_DW2_LN0_B 0x6C508
|
|
|
|
#define _PORT_TX_DW2_LN0_C 0x6C908
|
|
|
|
#define _PORT_TX_DW2_GRP_A 0x162D08
|
|
|
|
#define _PORT_TX_DW2_GRP_B 0x6CD08
|
|
|
|
#define _PORT_TX_DW2_GRP_C 0x6CF08
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define BXT_PORT_TX_DW2_GRP(port) _MMIO_PORT3(port, _PORT_TX_DW2_GRP_A, \
|
2014-11-18 10:15:27 +00:00
|
|
|
_PORT_TX_DW2_GRP_B, \
|
|
|
|
_PORT_TX_DW2_GRP_C)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define BXT_PORT_TX_DW2_LN0(port) _MMIO_PORT3(port, _PORT_TX_DW2_LN0_A, \
|
2014-11-18 10:15:27 +00:00
|
|
|
_PORT_TX_DW2_LN0_B, \
|
|
|
|
_PORT_TX_DW2_LN0_C)
|
|
|
|
#define MARGIN_000_SHIFT 16
|
|
|
|
#define MARGIN_000 (0xFF << MARGIN_000_SHIFT)
|
|
|
|
#define UNIQ_TRANS_SCALE_SHIFT 8
|
|
|
|
#define UNIQ_TRANS_SCALE (0xFF << UNIQ_TRANS_SCALE_SHIFT)
|
|
|
|
|
|
|
|
#define _PORT_TX_DW3_LN0_A 0x16250C
|
|
|
|
#define _PORT_TX_DW3_LN0_B 0x6C50C
|
|
|
|
#define _PORT_TX_DW3_LN0_C 0x6C90C
|
|
|
|
#define _PORT_TX_DW3_GRP_A 0x162D0C
|
|
|
|
#define _PORT_TX_DW3_GRP_B 0x6CD0C
|
|
|
|
#define _PORT_TX_DW3_GRP_C 0x6CF0C
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define BXT_PORT_TX_DW3_GRP(port) _MMIO_PORT3(port, _PORT_TX_DW3_GRP_A, \
|
2014-11-18 10:15:27 +00:00
|
|
|
_PORT_TX_DW3_GRP_B, \
|
|
|
|
_PORT_TX_DW3_GRP_C)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define BXT_PORT_TX_DW3_LN0(port) _MMIO_PORT3(port, _PORT_TX_DW3_LN0_A, \
|
2014-11-18 10:15:27 +00:00
|
|
|
_PORT_TX_DW3_LN0_B, \
|
|
|
|
_PORT_TX_DW3_LN0_C)
|
2015-09-24 04:52:54 +00:00
|
|
|
#define SCALE_DCOMP_METHOD (1 << 26)
|
|
|
|
#define UNIQUE_TRANGE_EN_METHOD (1 << 27)
|
2014-11-18 10:15:27 +00:00
|
|
|
|
|
|
|
#define _PORT_TX_DW4_LN0_A 0x162510
|
|
|
|
#define _PORT_TX_DW4_LN0_B 0x6C510
|
|
|
|
#define _PORT_TX_DW4_LN0_C 0x6C910
|
|
|
|
#define _PORT_TX_DW4_GRP_A 0x162D10
|
|
|
|
#define _PORT_TX_DW4_GRP_B 0x6CD10
|
|
|
|
#define _PORT_TX_DW4_GRP_C 0x6CF10
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define BXT_PORT_TX_DW4_LN0(port) _MMIO_PORT3(port, _PORT_TX_DW4_LN0_A, \
|
2014-11-18 10:15:27 +00:00
|
|
|
_PORT_TX_DW4_LN0_B, \
|
|
|
|
_PORT_TX_DW4_LN0_C)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define BXT_PORT_TX_DW4_GRP(port) _MMIO_PORT3(port, _PORT_TX_DW4_GRP_A, \
|
2014-11-18 10:15:27 +00:00
|
|
|
_PORT_TX_DW4_GRP_B, \
|
|
|
|
_PORT_TX_DW4_GRP_C)
|
|
|
|
#define DEEMPH_SHIFT 24
|
|
|
|
#define DE_EMPHASIS (0xFF << DEEMPH_SHIFT)
|
|
|
|
|
drm/i915/bxt: add display initialize/uninitialize sequence (PHY)
Add PHY specific display initialization sequence as per BSpec.
Note that the PHY initialization/uninitialization are done
at their current place only for simplicity, in a future patch - when more
of the runtime PM features will be enabled - these will be moved to
power well#1 and modeset encoder enabling/disabling hooks respectively.
The call to uninitialize the PHY during system/runtime suspend will be
added later in this patchset.
v1: Added function definitions in header files
v2: Imre's review comments addressed
- Moved CDCLK related definitions to i915_reg.h
- Removed defintions for CDCLK frequency
- Split uninit_cdclk() by adding a phy_uninit function
- Calculate freq and decimal based on input frequency
- Program SSA precharge based on input frequency
- Use wait_for 1ms instead 200us udelay for DE PLL locking
- Removed initial value for divider, freq, decimal, ratio.
- Replaced polling loops with wait_for
- Parameterized latency optim setting
- Fix the parts where DE PLL has to be disabled.
- Call CDCLK selection from mode set
v3: (imre)
- add note about the plan to move the cdclk/phy init to a better place
- take rps.hw_lock around pcode access
- fix DDI PHY timeout value
- squash in Vandana's "PORT_CL2CM_DW6_A BUN fix",
"DDI PHY programming register defn", "Do ddi_phy_init always",
- move PHY register macros next to the corresponding CHV/VLV macros
- move DE PLL register macros here from another patch since they are
used here first
- add BXT_ prefix to CDCLK flags
- s/COMMON_RESET/COMMON_RESET_DIS/ and clarify related code comments
- fix incorrect read value for the RMW of BXT_PHY_CTL_FAMILY_DDI
- fix using GT_DISPLAY_EDP_POWER_ON vs. GT_DISPLAY_DDI_POWER_ON
when powering on DDI ports
- fix incorrect port when setting BXT_PORT_TX_DW14_LN for DDI ports
- add missing masking when programming CDCLK_FREQ_DECIMAL
- add missing powering on for DDI-C port, rename OCL2_LDOFUSE_PWR_EN
to OCL2_LDOFUSE_PWR_DIS to reduce confusion
- add note about mismatch with bspec in the PORT_REF_DW6 fields
- factor out PHY init code to a new function, so we can call it for
PHY1 and PHY0, instead of open-coding the same
v4: (ville)
- split the CDCLK/PHY parts into two patches, update commit message
accordingly
- use the existing dpio_phy enum instead of adding a new one for the
same purpose
- flip the meaning of PHYs so that PHY_A is PHY1 and PHY_BC is PHY0 to
better match CHV
- s/BXT_PHY/_BXT_PHY/
- use _PIPE for _BXT_PHY instead of open-coding it
- drop _0_2_0_GTTMMADR suffix from BXT_P_CR_GT_DISP_PWRON
- define GT_DISPLAY_POWER_ON in a more standard way
- make a note that the CHV ConfigDB also disagrees about GRC_CODE field
definitions
- fix lane optimization refactoring fumble from v3
- add per PHY uninit functions to match the init counterparts
Signed-off-by: Vandana Kannan <vandana.kannan@intel.com> (v2)
Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-11-24 08:07:39 +00:00
|
|
|
#define _PORT_TX_DW14_LN0_A 0x162538
|
|
|
|
#define _PORT_TX_DW14_LN0_B 0x6C538
|
|
|
|
#define _PORT_TX_DW14_LN0_C 0x6C938
|
|
|
|
#define LATENCY_OPTIM_SHIFT 30
|
|
|
|
#define LATENCY_OPTIM (1 << LATENCY_OPTIM_SHIFT)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define BXT_PORT_TX_DW14_LN(port, lane) _MMIO(_PORT3((port), _PORT_TX_DW14_LN0_A, \
|
drm/i915/bxt: add display initialize/uninitialize sequence (PHY)
Add PHY specific display initialization sequence as per BSpec.
Note that the PHY initialization/uninitialization are done
at their current place only for simplicity, in a future patch - when more
of the runtime PM features will be enabled - these will be moved to
power well#1 and modeset encoder enabling/disabling hooks respectively.
The call to uninitialize the PHY during system/runtime suspend will be
added later in this patchset.
v1: Added function definitions in header files
v2: Imre's review comments addressed
- Moved CDCLK related definitions to i915_reg.h
- Removed defintions for CDCLK frequency
- Split uninit_cdclk() by adding a phy_uninit function
- Calculate freq and decimal based on input frequency
- Program SSA precharge based on input frequency
- Use wait_for 1ms instead 200us udelay for DE PLL locking
- Removed initial value for divider, freq, decimal, ratio.
- Replaced polling loops with wait_for
- Parameterized latency optim setting
- Fix the parts where DE PLL has to be disabled.
- Call CDCLK selection from mode set
v3: (imre)
- add note about the plan to move the cdclk/phy init to a better place
- take rps.hw_lock around pcode access
- fix DDI PHY timeout value
- squash in Vandana's "PORT_CL2CM_DW6_A BUN fix",
"DDI PHY programming register defn", "Do ddi_phy_init always",
- move PHY register macros next to the corresponding CHV/VLV macros
- move DE PLL register macros here from another patch since they are
used here first
- add BXT_ prefix to CDCLK flags
- s/COMMON_RESET/COMMON_RESET_DIS/ and clarify related code comments
- fix incorrect read value for the RMW of BXT_PHY_CTL_FAMILY_DDI
- fix using GT_DISPLAY_EDP_POWER_ON vs. GT_DISPLAY_DDI_POWER_ON
when powering on DDI ports
- fix incorrect port when setting BXT_PORT_TX_DW14_LN for DDI ports
- add missing masking when programming CDCLK_FREQ_DECIMAL
- add missing powering on for DDI-C port, rename OCL2_LDOFUSE_PWR_EN
to OCL2_LDOFUSE_PWR_DIS to reduce confusion
- add note about mismatch with bspec in the PORT_REF_DW6 fields
- factor out PHY init code to a new function, so we can call it for
PHY1 and PHY0, instead of open-coding the same
v4: (ville)
- split the CDCLK/PHY parts into two patches, update commit message
accordingly
- use the existing dpio_phy enum instead of adding a new one for the
same purpose
- flip the meaning of PHYs so that PHY_A is PHY1 and PHY_BC is PHY0 to
better match CHV
- s/BXT_PHY/_BXT_PHY/
- use _PIPE for _BXT_PHY instead of open-coding it
- drop _0_2_0_GTTMMADR suffix from BXT_P_CR_GT_DISP_PWRON
- define GT_DISPLAY_POWER_ON in a more standard way
- make a note that the CHV ConfigDB also disagrees about GRC_CODE field
definitions
- fix lane optimization refactoring fumble from v3
- add per PHY uninit functions to match the init counterparts
Signed-off-by: Vandana Kannan <vandana.kannan@intel.com> (v2)
Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-11-24 08:07:39 +00:00
|
|
|
_PORT_TX_DW14_LN0_B, \
|
|
|
|
_PORT_TX_DW14_LN0_C) + \
|
|
|
|
_BXT_LANE_OFFSET(lane))
|
|
|
|
|
2015-06-25 08:11:03 +00:00
|
|
|
/* UAIMI scratch pad register 1 */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define UAIMI_SPR1 _MMIO(0x4F074)
|
2015-06-25 08:11:03 +00:00
|
|
|
/* SKL VccIO mask */
|
|
|
|
#define SKL_VCCIO_MASK 0x1
|
|
|
|
/* SKL balance leg register */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define DISPIO_CR_TX_BMU_CR0 _MMIO(0x6C00C)
|
2015-06-25 08:11:03 +00:00
|
|
|
/* I_boost values */
|
|
|
|
#define BALANCE_LEG_SHIFT(port) (8+3*(port))
|
|
|
|
#define BALANCE_LEG_MASK(port) (7<<(8+3*(port)))
|
|
|
|
/* Balance leg disable bits */
|
|
|
|
#define BALANCE_LEG_DISABLE_SHIFT 23
|
|
|
|
|
2008-07-29 18:54:06 +00:00
|
|
|
/*
|
2008-11-12 18:03:55 +00:00
|
|
|
* Fence registers
|
2015-09-21 15:05:14 +00:00
|
|
|
* [0-7] @ 0x2000 gen2,gen3
|
|
|
|
* [8-15] @ 0x3000 945,g33,pnv
|
|
|
|
*
|
|
|
|
* [0-15] @ 0x3000 gen4,gen5
|
|
|
|
*
|
|
|
|
* [0-15] @ 0x100000 gen6,vlv,chv
|
|
|
|
* [0-31] @ 0x100000 gen7+
|
2008-07-29 18:54:06 +00:00
|
|
|
*/
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define FENCE_REG(i) _MMIO(0x2000 + (((i) & 8) << 9) + ((i) & 7) * 4)
|
2008-11-12 18:03:55 +00:00
|
|
|
#define I830_FENCE_START_MASK 0x07f80000
|
|
|
|
#define I830_FENCE_TILING_Y_SHIFT 12
|
2009-01-27 01:10:45 +00:00
|
|
|
#define I830_FENCE_SIZE_BITS(size) ((ffs((size) >> 19) - 1) << 8)
|
2008-11-12 18:03:55 +00:00
|
|
|
#define I830_FENCE_PITCH_SHIFT 4
|
|
|
|
#define I830_FENCE_REG_VALID (1<<0)
|
2010-04-17 13:12:03 +00:00
|
|
|
#define I915_FENCE_MAX_PITCH_VAL 4
|
2009-05-27 00:44:56 +00:00
|
|
|
#define I830_FENCE_MAX_PITCH_VAL 6
|
2009-03-29 12:09:41 +00:00
|
|
|
#define I830_FENCE_MAX_SIZE_VAL (1<<8)
|
2008-11-12 18:03:55 +00:00
|
|
|
|
|
|
|
#define I915_FENCE_START_MASK 0x0ff00000
|
2009-01-27 01:10:45 +00:00
|
|
|
#define I915_FENCE_SIZE_BITS(size) ((ffs((size) >> 20) - 1) << 8)
|
2008-07-29 18:54:06 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define FENCE_REG_965_LO(i) _MMIO(0x03000 + (i) * 8)
|
|
|
|
#define FENCE_REG_965_HI(i) _MMIO(0x03000 + (i) * 8 + 4)
|
2008-11-12 18:03:55 +00:00
|
|
|
#define I965_FENCE_PITCH_SHIFT 2
|
|
|
|
#define I965_FENCE_TILING_Y_SHIFT 1
|
|
|
|
#define I965_FENCE_REG_VALID (1<<0)
|
2009-03-29 12:09:41 +00:00
|
|
|
#define I965_FENCE_MAX_PITCH_VAL 0x0400
|
2008-11-12 18:03:55 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define FENCE_REG_GEN6_LO(i) _MMIO(0x100000 + (i) * 8)
|
|
|
|
#define FENCE_REG_GEN6_HI(i) _MMIO(0x100000 + (i) * 8 + 4)
|
2015-09-21 15:05:14 +00:00
|
|
|
#define GEN6_FENCE_PITCH_SHIFT 32
|
2013-04-09 08:45:05 +00:00
|
|
|
#define GEN7_FENCE_MAX_PITCH_VAL 0x0800
|
2009-10-26 23:44:17 +00:00
|
|
|
|
2014-05-27 10:29:30 +00:00
|
|
|
|
2012-02-02 08:58:12 +00:00
|
|
|
/* control register for cpu gtt access */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define TILECTL _MMIO(0x101000)
|
2012-02-02 08:58:12 +00:00
|
|
|
#define TILECTL_SWZCTL (1 << 0)
|
2015-03-11 08:28:25 +00:00
|
|
|
#define TILECTL_TLBPF (1 << 1)
|
2012-02-02 08:58:12 +00:00
|
|
|
#define TILECTL_TLB_PREFETCH_DIS (1 << 2)
|
|
|
|
#define TILECTL_BACKSNOOP_DIS (1 << 3)
|
|
|
|
|
2008-11-12 18:03:55 +00:00
|
|
|
/*
|
|
|
|
* Instruction and interrupt control regs
|
|
|
|
*/
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define PGTBL_CTL _MMIO(0x02020)
|
2014-06-05 17:02:59 +00:00
|
|
|
#define PGTBL_ADDRESS_LO_MASK 0xfffff000 /* bits [31:12] */
|
|
|
|
#define PGTBL_ADDRESS_HI_MASK 0x000000f0 /* bits [35:32] (gen4) */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define PGTBL_ER _MMIO(0x02024)
|
|
|
|
#define PRB0_BASE (0x2030-0x30)
|
|
|
|
#define PRB1_BASE (0x2040-0x30) /* 830,gen3 */
|
|
|
|
#define PRB2_BASE (0x2050-0x30) /* gen3 */
|
|
|
|
#define SRB0_BASE (0x2100-0x30) /* gen2 */
|
|
|
|
#define SRB1_BASE (0x2110-0x30) /* gen2 */
|
|
|
|
#define SRB2_BASE (0x2120-0x30) /* 830 */
|
|
|
|
#define SRB3_BASE (0x2130-0x30) /* 830 */
|
2010-08-02 14:24:01 +00:00
|
|
|
#define RENDER_RING_BASE 0x02000
|
|
|
|
#define BSD_RING_BASE 0x04000
|
|
|
|
#define GEN6_BSD_RING_BASE 0x12000
|
2014-04-17 02:37:37 +00:00
|
|
|
#define GEN8_BSD2_RING_BASE 0x1c000
|
2013-05-29 02:22:20 +00:00
|
|
|
#define VEBOX_RING_BASE 0x1a000
|
2010-10-19 10:19:32 +00:00
|
|
|
#define BLT_RING_BASE 0x22000
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define RING_TAIL(base) _MMIO((base)+0x30)
|
|
|
|
#define RING_HEAD(base) _MMIO((base)+0x34)
|
|
|
|
#define RING_START(base) _MMIO((base)+0x38)
|
|
|
|
#define RING_CTL(base) _MMIO((base)+0x3c)
|
|
|
|
#define RING_SYNC_0(base) _MMIO((base)+0x40)
|
|
|
|
#define RING_SYNC_1(base) _MMIO((base)+0x44)
|
|
|
|
#define RING_SYNC_2(base) _MMIO((base)+0x48)
|
2013-05-29 02:22:20 +00:00
|
|
|
#define GEN6_RVSYNC (RING_SYNC_0(RENDER_RING_BASE))
|
|
|
|
#define GEN6_RBSYNC (RING_SYNC_1(RENDER_RING_BASE))
|
|
|
|
#define GEN6_RVESYNC (RING_SYNC_2(RENDER_RING_BASE))
|
|
|
|
#define GEN6_VBSYNC (RING_SYNC_0(GEN6_BSD_RING_BASE))
|
|
|
|
#define GEN6_VRSYNC (RING_SYNC_1(GEN6_BSD_RING_BASE))
|
|
|
|
#define GEN6_VVESYNC (RING_SYNC_2(GEN6_BSD_RING_BASE))
|
|
|
|
#define GEN6_BRSYNC (RING_SYNC_0(BLT_RING_BASE))
|
|
|
|
#define GEN6_BVSYNC (RING_SYNC_1(BLT_RING_BASE))
|
|
|
|
#define GEN6_BVESYNC (RING_SYNC_2(BLT_RING_BASE))
|
|
|
|
#define GEN6_VEBSYNC (RING_SYNC_0(VEBOX_RING_BASE))
|
|
|
|
#define GEN6_VERSYNC (RING_SYNC_1(VEBOX_RING_BASE))
|
|
|
|
#define GEN6_VEVSYNC (RING_SYNC_2(VEBOX_RING_BASE))
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN6_NOSYNC INVALID_MMIO_REG
|
|
|
|
#define RING_PSMI_CTL(base) _MMIO((base)+0x50)
|
|
|
|
#define RING_MAX_IDLE(base) _MMIO((base)+0x54)
|
|
|
|
#define RING_HWS_PGA(base) _MMIO((base)+0x80)
|
|
|
|
#define RING_HWS_PGA_GEN6(base) _MMIO((base)+0x2080)
|
|
|
|
#define RING_RESET_CTL(base) _MMIO((base)+0xd0)
|
2015-06-18 09:51:40 +00:00
|
|
|
#define RESET_CTL_REQUEST_RESET (1 << 0)
|
|
|
|
#define RESET_CTL_READY_TO_RESET (1 << 1)
|
2014-05-05 12:13:55 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define HSW_GTT_CACHE_EN _MMIO(0x4024)
|
2015-05-19 17:32:57 +00:00
|
|
|
#define GTT_CACHE_EN_ALL 0xF0007FFF
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN7_WR_WATERMARK _MMIO(0x4028)
|
|
|
|
#define GEN7_GFX_PRIO_CTRL _MMIO(0x402C)
|
|
|
|
#define ARB_MODE _MMIO(0x4030)
|
2012-02-02 08:58:12 +00:00
|
|
|
#define ARB_MODE_SWIZZLE_SNB (1<<4)
|
|
|
|
#define ARB_MODE_SWIZZLE_IVB (1<<5)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN7_GFX_PEND_TLB0 _MMIO(0x4034)
|
|
|
|
#define GEN7_GFX_PEND_TLB1 _MMIO(0x4038)
|
2014-05-05 12:13:55 +00:00
|
|
|
/* L3, CVS, ZTLB, RCC, CASC LRA min, max values */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN7_LRA_LIMITS(i) _MMIO(0x403C + (i) * 4)
|
2014-05-05 12:13:55 +00:00
|
|
|
#define GEN7_LRA_LIMITS_REG_NUM 13
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN7_MEDIA_MAX_REQ_COUNT _MMIO(0x4070)
|
|
|
|
#define GEN7_GFX_MAX_REQ_COUNT _MMIO(0x4074)
|
2014-05-05 12:13:55 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GAMTARBMODE _MMIO(0x04a08)
|
2013-11-03 04:07:55 +00:00
|
|
|
#define ARB_MODE_BWGTLB_DISABLE (1<<9)
|
2013-11-03 04:07:04 +00:00
|
|
|
#define ARB_MODE_SWIZZLE_BDW (1<<1)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define RENDER_HWS_PGA_GEN7 _MMIO(0x04080)
|
|
|
|
#define RING_FAULT_REG(ring) _MMIO(0x4094 + 0x100*(ring)->id)
|
2013-10-16 16:21:30 +00:00
|
|
|
#define RING_FAULT_GTTSEL_MASK (1<<11)
|
2015-09-18 17:03:39 +00:00
|
|
|
#define RING_FAULT_SRCID(x) (((x) >> 3) & 0xff)
|
|
|
|
#define RING_FAULT_FAULT_TYPE(x) (((x) >> 1) & 0x3)
|
2013-10-16 16:21:30 +00:00
|
|
|
#define RING_FAULT_VALID (1<<0)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define DONE_REG _MMIO(0x40b0)
|
|
|
|
#define GEN8_PRIVATE_PAT_LO _MMIO(0x40e0)
|
|
|
|
#define GEN8_PRIVATE_PAT_HI _MMIO(0x40e0 + 4)
|
|
|
|
#define BSD_HWS_PGA_GEN7 _MMIO(0x04180)
|
|
|
|
#define BLT_HWS_PGA_GEN7 _MMIO(0x04280)
|
|
|
|
#define VEBOX_HWS_PGA_GEN7 _MMIO(0x04380)
|
|
|
|
#define RING_ACTHD(base) _MMIO((base)+0x74)
|
|
|
|
#define RING_ACTHD_UDW(base) _MMIO((base)+0x5c)
|
|
|
|
#define RING_NOPID(base) _MMIO((base)+0x94)
|
|
|
|
#define RING_IMR(base) _MMIO((base)+0xa8)
|
|
|
|
#define RING_HWSTAM(base) _MMIO((base)+0x98)
|
|
|
|
#define RING_TIMESTAMP(base) _MMIO((base)+0x358)
|
|
|
|
#define RING_TIMESTAMP_UDW(base) _MMIO((base)+0x358 + 4)
|
2008-07-29 18:54:06 +00:00
|
|
|
#define TAIL_ADDR 0x001FFFF8
|
|
|
|
#define HEAD_WRAP_COUNT 0xFFE00000
|
|
|
|
#define HEAD_WRAP_ONE 0x00200000
|
|
|
|
#define HEAD_ADDR 0x001FFFFC
|
|
|
|
#define RING_NR_PAGES 0x001FF000
|
|
|
|
#define RING_REPORT_MASK 0x00000006
|
|
|
|
#define RING_REPORT_64K 0x00000002
|
|
|
|
#define RING_REPORT_128K 0x00000004
|
|
|
|
#define RING_NO_REPORT 0x00000000
|
|
|
|
#define RING_VALID_MASK 0x00000001
|
|
|
|
#define RING_VALID 0x00000001
|
|
|
|
#define RING_INVALID 0x00000000
|
2010-08-08 10:53:53 +00:00
|
|
|
#define RING_WAIT_I8XX (1<<0) /* gen2, PRBx_HEAD */
|
|
|
|
#define RING_WAIT (1<<11) /* gen3+, PRBx_CTL */
|
2010-12-04 11:30:53 +00:00
|
|
|
#define RING_WAIT_SEMAPHORE (1<<10) /* gen6+ */
|
2014-05-05 12:13:55 +00:00
|
|
|
|
2016-01-21 21:43:47 +00:00
|
|
|
#define RING_FORCE_TO_NONPRIV(base, i) _MMIO(((base)+0x4D0) + (i)*4)
|
|
|
|
#define RING_MAX_NONPRIV_SLOTS 12
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN7_TLB_RD_ADDR _MMIO(0x4700)
|
2014-05-05 12:13:55 +00:00
|
|
|
|
2010-11-11 17:54:52 +00:00
|
|
|
#if 0
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define PRB0_TAIL _MMIO(0x2030)
|
|
|
|
#define PRB0_HEAD _MMIO(0x2034)
|
|
|
|
#define PRB0_START _MMIO(0x2038)
|
|
|
|
#define PRB0_CTL _MMIO(0x203c)
|
|
|
|
#define PRB1_TAIL _MMIO(0x2040) /* 915+ only */
|
|
|
|
#define PRB1_HEAD _MMIO(0x2044) /* 915+ only */
|
|
|
|
#define PRB1_START _MMIO(0x2048) /* 915+ only */
|
|
|
|
#define PRB1_CTL _MMIO(0x204c) /* 915+ only */
|
2010-11-11 17:54:52 +00:00
|
|
|
#endif
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define IPEIR_I965 _MMIO(0x2064)
|
|
|
|
#define IPEHR_I965 _MMIO(0x2068)
|
|
|
|
#define GEN7_SC_INSTDONE _MMIO(0x7100)
|
|
|
|
#define GEN7_SAMPLER_INSTDONE _MMIO(0xe160)
|
|
|
|
#define GEN7_ROW_INSTDONE _MMIO(0xe164)
|
2012-08-22 18:32:14 +00:00
|
|
|
#define I915_NUM_INSTDONE_REG 4
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define RING_IPEIR(base) _MMIO((base)+0x64)
|
|
|
|
#define RING_IPEHR(base) _MMIO((base)+0x68)
|
2015-09-30 20:00:42 +00:00
|
|
|
/*
|
|
|
|
* On GEN4, only the render ring INSTDONE exists and has a different
|
|
|
|
* layout than the GEN7+ version.
|
2015-09-30 20:00:43 +00:00
|
|
|
* The GEN2 counterpart of this register is GEN2_INSTDONE.
|
2015-09-30 20:00:42 +00:00
|
|
|
*/
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define RING_INSTDONE(base) _MMIO((base)+0x6c)
|
|
|
|
#define RING_INSTPS(base) _MMIO((base)+0x70)
|
|
|
|
#define RING_DMA_FADD(base) _MMIO((base)+0x78)
|
|
|
|
#define RING_DMA_FADD_UDW(base) _MMIO((base)+0x60) /* gen8+ */
|
|
|
|
#define RING_INSTPM(base) _MMIO((base)+0xc0)
|
|
|
|
#define RING_MI_MODE(base) _MMIO((base)+0x9c)
|
|
|
|
#define INSTPS _MMIO(0x2070) /* 965+ only */
|
|
|
|
#define GEN4_INSTDONE1 _MMIO(0x207c) /* 965+ only, aka INSTDONE_2 on SNB */
|
|
|
|
#define ACTHD_I965 _MMIO(0x2074)
|
|
|
|
#define HWS_PGA _MMIO(0x2080)
|
2008-07-29 18:54:06 +00:00
|
|
|
#define HWS_ADDRESS_MASK 0xfffff000
|
|
|
|
#define HWS_START_ADDRESS_SHIFT 4
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define PWRCTXA _MMIO(0x2088) /* 965GM+ only */
|
2009-10-08 17:16:48 +00:00
|
|
|
#define PWRCTX_EN (1<<0)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define IPEIR _MMIO(0x2088)
|
|
|
|
#define IPEHR _MMIO(0x208c)
|
|
|
|
#define GEN2_INSTDONE _MMIO(0x2090)
|
|
|
|
#define NOPID _MMIO(0x2094)
|
|
|
|
#define HWSTAM _MMIO(0x2098)
|
|
|
|
#define DMA_FADD_I8XX _MMIO(0x20d0)
|
|
|
|
#define RING_BBSTATE(base) _MMIO((base)+0x110)
|
2015-11-04 21:20:10 +00:00
|
|
|
#define RING_BB_PPGTT (1 << 5)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define RING_SBBADDR(base) _MMIO((base)+0x114) /* hsw+ */
|
|
|
|
#define RING_SBBSTATE(base) _MMIO((base)+0x118) /* hsw+ */
|
|
|
|
#define RING_SBBADDR_UDW(base) _MMIO((base)+0x11c) /* gen8+ */
|
|
|
|
#define RING_BBADDR(base) _MMIO((base)+0x140)
|
|
|
|
#define RING_BBADDR_UDW(base) _MMIO((base)+0x168) /* gen8+ */
|
|
|
|
#define RING_BB_PER_CTX_PTR(base) _MMIO((base)+0x1c0) /* gen8+ */
|
|
|
|
#define RING_INDIRECT_CTX(base) _MMIO((base)+0x1c4) /* gen8+ */
|
|
|
|
#define RING_INDIRECT_CTX_OFFSET(base) _MMIO((base)+0x1c8) /* gen8+ */
|
|
|
|
#define RING_CTX_TIMESTAMP(base) _MMIO((base)+0x3a8) /* gen8+ */
|
|
|
|
|
|
|
|
#define ERROR_GEN6 _MMIO(0x40a0)
|
|
|
|
#define GEN7_ERR_INT _MMIO(0x44040)
|
2013-04-12 20:57:58 +00:00
|
|
|
#define ERR_INT_POISON (1<<31)
|
drm/i915: report Gen5+ CPU and PCH FIFO underruns
In this commit we enable both CPU and PCH FIFO underrun reporting and
start reporting them. We follow a few rules:
- after we receive one of these errors, we mask the interrupt, so
we won't get an "interrupt storm" and we also won't flood dmesg;
- at each mode set we enable the interrupts again, so we'll see each
message at most once per mode set;
- in the specific places where we need to ignore the errors, we
completely mask the interrupts.
The downside of this patch is that since we're completely disabling
(masking) the interrupts instead of just not printing error messages,
we will mask more than just what we want on IVB/HSW CPU interrupts
(due to GEN7_ERR_INT) and on CPT/PPT/LPT PCHs (due to SERR_INT). So
when we decide to mask PCH FIFO underruns for pipe A on CPT, we'll
also be masking PCH FIFO underruns for pipe B, because both are
reported by SERR_INT, which has to be either completely enabled or
completely disabled (in othe words, there's no way to disable/enable
specific bits of GEN7_ERR_INT and SERR_INT).
V2: Rename some functions and variables, downgrade messages to
DRM_DEBUG_DRIVER and rebase.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2013-04-12 20:57:57 +00:00
|
|
|
#define ERR_INT_MMIO_UNCLAIMED (1<<13)
|
2013-10-15 17:55:27 +00:00
|
|
|
#define ERR_INT_PIPE_CRC_DONE_C (1<<8)
|
drm/i915: report Gen5+ CPU and PCH FIFO underruns
In this commit we enable both CPU and PCH FIFO underrun reporting and
start reporting them. We follow a few rules:
- after we receive one of these errors, we mask the interrupt, so
we won't get an "interrupt storm" and we also won't flood dmesg;
- at each mode set we enable the interrupts again, so we'll see each
message at most once per mode set;
- in the specific places where we need to ignore the errors, we
completely mask the interrupts.
The downside of this patch is that since we're completely disabling
(masking) the interrupts instead of just not printing error messages,
we will mask more than just what we want on IVB/HSW CPU interrupts
(due to GEN7_ERR_INT) and on CPT/PPT/LPT PCHs (due to SERR_INT). So
when we decide to mask PCH FIFO underruns for pipe A on CPT, we'll
also be masking PCH FIFO underruns for pipe B, because both are
reported by SERR_INT, which has to be either completely enabled or
completely disabled (in othe words, there's no way to disable/enable
specific bits of GEN7_ERR_INT and SERR_INT).
V2: Rename some functions and variables, downgrade messages to
DRM_DEBUG_DRIVER and rebase.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2013-04-12 20:57:57 +00:00
|
|
|
#define ERR_INT_FIFO_UNDERRUN_C (1<<6)
|
2013-10-15 17:55:27 +00:00
|
|
|
#define ERR_INT_PIPE_CRC_DONE_B (1<<5)
|
drm/i915: report Gen5+ CPU and PCH FIFO underruns
In this commit we enable both CPU and PCH FIFO underrun reporting and
start reporting them. We follow a few rules:
- after we receive one of these errors, we mask the interrupt, so
we won't get an "interrupt storm" and we also won't flood dmesg;
- at each mode set we enable the interrupts again, so we'll see each
message at most once per mode set;
- in the specific places where we need to ignore the errors, we
completely mask the interrupts.
The downside of this patch is that since we're completely disabling
(masking) the interrupts instead of just not printing error messages,
we will mask more than just what we want on IVB/HSW CPU interrupts
(due to GEN7_ERR_INT) and on CPT/PPT/LPT PCHs (due to SERR_INT). So
when we decide to mask PCH FIFO underruns for pipe A on CPT, we'll
also be masking PCH FIFO underruns for pipe B, because both are
reported by SERR_INT, which has to be either completely enabled or
completely disabled (in othe words, there's no way to disable/enable
specific bits of GEN7_ERR_INT and SERR_INT).
V2: Rename some functions and variables, downgrade messages to
DRM_DEBUG_DRIVER and rebase.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2013-04-12 20:57:57 +00:00
|
|
|
#define ERR_INT_FIFO_UNDERRUN_B (1<<3)
|
2013-10-15 17:55:27 +00:00
|
|
|
#define ERR_INT_PIPE_CRC_DONE_A (1<<2)
|
2015-09-18 17:03:39 +00:00
|
|
|
#define ERR_INT_PIPE_CRC_DONE(pipe) (1<<(2 + (pipe)*3))
|
drm/i915: report Gen5+ CPU and PCH FIFO underruns
In this commit we enable both CPU and PCH FIFO underrun reporting and
start reporting them. We follow a few rules:
- after we receive one of these errors, we mask the interrupt, so
we won't get an "interrupt storm" and we also won't flood dmesg;
- at each mode set we enable the interrupts again, so we'll see each
message at most once per mode set;
- in the specific places where we need to ignore the errors, we
completely mask the interrupts.
The downside of this patch is that since we're completely disabling
(masking) the interrupts instead of just not printing error messages,
we will mask more than just what we want on IVB/HSW CPU interrupts
(due to GEN7_ERR_INT) and on CPT/PPT/LPT PCHs (due to SERR_INT). So
when we decide to mask PCH FIFO underruns for pipe A on CPT, we'll
also be masking PCH FIFO underruns for pipe B, because both are
reported by SERR_INT, which has to be either completely enabled or
completely disabled (in othe words, there's no way to disable/enable
specific bits of GEN7_ERR_INT and SERR_INT).
V2: Rename some functions and variables, downgrade messages to
DRM_DEBUG_DRIVER and rebase.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2013-04-12 20:57:57 +00:00
|
|
|
#define ERR_INT_FIFO_UNDERRUN_A (1<<0)
|
2015-09-18 17:03:39 +00:00
|
|
|
#define ERR_INT_FIFO_UNDERRUN(pipe) (1<<((pipe)*3))
|
2010-10-27 19:36:41 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN8_FAULT_TLB_DATA0 _MMIO(0x4b10)
|
|
|
|
#define GEN8_FAULT_TLB_DATA1 _MMIO(0x4b14)
|
2015-03-24 12:54:19 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define FPGA_DBG _MMIO(0x42300)
|
2013-02-18 22:00:21 +00:00
|
|
|
#define FPGA_DBG_RM_NOCLAIM (1<<31)
|
|
|
|
|
2015-12-15 17:45:42 +00:00
|
|
|
#define CLAIM_ER _MMIO(VLV_DISPLAY_BASE + 0x2028)
|
|
|
|
#define CLAIM_ER_CLR (1 << 31)
|
|
|
|
#define CLAIM_ER_OVERFLOW (1 << 16)
|
|
|
|
#define CLAIM_ER_CTR_MASK 0xffff
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define DERRMR _MMIO(0x44050)
|
2013-11-03 04:07:07 +00:00
|
|
|
/* Note that HBLANK events are reserved on bdw+ */
|
2013-08-26 19:58:12 +00:00
|
|
|
#define DERRMR_PIPEA_SCANLINE (1<<0)
|
|
|
|
#define DERRMR_PIPEA_PRI_FLIP_DONE (1<<1)
|
|
|
|
#define DERRMR_PIPEA_SPR_FLIP_DONE (1<<2)
|
|
|
|
#define DERRMR_PIPEA_VBLANK (1<<3)
|
|
|
|
#define DERRMR_PIPEA_HBLANK (1<<5)
|
|
|
|
#define DERRMR_PIPEB_SCANLINE (1<<8)
|
|
|
|
#define DERRMR_PIPEB_PRI_FLIP_DONE (1<<9)
|
|
|
|
#define DERRMR_PIPEB_SPR_FLIP_DONE (1<<10)
|
|
|
|
#define DERRMR_PIPEB_VBLANK (1<<11)
|
|
|
|
#define DERRMR_PIPEB_HBLANK (1<<13)
|
|
|
|
/* Note that PIPEC is not a simple translation of PIPEA/PIPEB */
|
|
|
|
#define DERRMR_PIPEC_SCANLINE (1<<14)
|
|
|
|
#define DERRMR_PIPEC_PRI_FLIP_DONE (1<<15)
|
|
|
|
#define DERRMR_PIPEC_SPR_FLIP_DONE (1<<20)
|
|
|
|
#define DERRMR_PIPEC_VBLANK (1<<21)
|
|
|
|
#define DERRMR_PIPEC_HBLANK (1<<22)
|
|
|
|
|
2013-01-15 12:05:55 +00:00
|
|
|
|
2010-11-06 21:53:32 +00:00
|
|
|
/* GM45+ chicken bits -- debug workaround bits that may be required
|
|
|
|
* for various sorts of correct behavior. The top 16 bits of each are
|
|
|
|
* the enables for writing to the corresponding low bit.
|
|
|
|
*/
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define _3D_CHICKEN _MMIO(0x2084)
|
2012-12-14 22:38:28 +00:00
|
|
|
#define _3D_CHICKEN_HIZ_PLANE_DISABLE_MSAA_4X_SNB (1 << 10)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define _3D_CHICKEN2 _MMIO(0x208c)
|
2010-11-06 21:53:32 +00:00
|
|
|
/* Disables pipelining of read flushes past the SF-WIZ interface.
|
|
|
|
* Required on all Ironlake steppings according to the B-Spec, but the
|
|
|
|
* particular danger of not doing so is not specified.
|
|
|
|
*/
|
|
|
|
# define _3D_CHICKEN2_WM_READ_PIPELINED (1 << 14)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define _3D_CHICKEN3 _MMIO(0x2090)
|
2012-10-02 22:43:41 +00:00
|
|
|
#define _3D_CHICKEN_SF_DISABLE_OBJEND_CULL (1 << 10)
|
2012-10-07 15:51:07 +00:00
|
|
|
#define _3D_CHICKEN3_SF_DISABLE_FASTCLIP_CULL (1 << 5)
|
2014-02-04 19:59:18 +00:00
|
|
|
#define _3D_CHICKEN_SDE_LIMIT_FIFO_POLY_DEPTH(x) ((x)<<1) /* gen8+ */
|
|
|
|
#define _3D_CHICKEN3_SF_DISABLE_PIPELINED_ATTR_FETCH (1 << 1) /* gen6 */
|
2010-11-06 21:53:32 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define MI_MODE _MMIO(0x209c)
|
2010-03-09 07:41:55 +00:00
|
|
|
# define VS_TIMER_DISPATCH (1 << 6)
|
2012-01-19 18:50:06 +00:00
|
|
|
# define MI_FLUSH_ENABLE (1 << 12)
|
2013-01-20 16:11:20 +00:00
|
|
|
# define ASYNC_FLIP_PERF_DISABLE (1 << 14)
|
2014-03-12 11:09:41 +00:00
|
|
|
# define MODE_IDLE (1 << 9)
|
2014-04-02 15:36:07 +00:00
|
|
|
# define STOP_RING (1 << 8)
|
2010-03-09 07:41:55 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN6_GT_MODE _MMIO(0x20d0)
|
|
|
|
#define GEN7_GT_MODE _MMIO(0x7008)
|
2014-02-04 19:59:15 +00:00
|
|
|
#define GEN6_WIZ_HASHING(hi, lo) (((hi) << 9) | ((lo) << 7))
|
|
|
|
#define GEN6_WIZ_HASHING_8x8 GEN6_WIZ_HASHING(0, 0)
|
|
|
|
#define GEN6_WIZ_HASHING_8x4 GEN6_WIZ_HASHING(0, 1)
|
|
|
|
#define GEN6_WIZ_HASHING_16x4 GEN6_WIZ_HASHING(1, 0)
|
2014-12-08 17:33:51 +00:00
|
|
|
#define GEN6_WIZ_HASHING_MASK GEN6_WIZ_HASHING(1, 1)
|
2012-12-14 22:38:29 +00:00
|
|
|
#define GEN6_TD_FOUR_ROW_DISPATCH_DISABLE (1 << 5)
|
2015-09-18 17:03:39 +00:00
|
|
|
#define GEN9_IZ_HASHING_MASK(slice) (0x3 << ((slice) * 2))
|
|
|
|
#define GEN9_IZ_HASHING(slice, val) ((val) << ((slice) * 2))
|
2012-10-04 02:34:24 +00:00
|
|
|
|
2016-03-21 14:37:29 +00:00
|
|
|
/* WaClearTdlStateAckDirtyBits */
|
|
|
|
#define GEN8_STATE_ACK _MMIO(0x20F0)
|
|
|
|
#define GEN9_STATE_ACK_SLICE1 _MMIO(0x20F8)
|
|
|
|
#define GEN9_STATE_ACK_SLICE2 _MMIO(0x2100)
|
|
|
|
#define GEN9_STATE_ACK_TDL0 (1 << 12)
|
|
|
|
#define GEN9_STATE_ACK_TDL1 (1 << 13)
|
|
|
|
#define GEN9_STATE_ACK_TDL2 (1 << 14)
|
|
|
|
#define GEN9_STATE_ACK_TDL3 (1 << 15)
|
|
|
|
#define GEN9_SUBSLICE_TDL_ACK_BITS \
|
|
|
|
(GEN9_STATE_ACK_TDL3 | GEN9_STATE_ACK_TDL2 | \
|
|
|
|
GEN9_STATE_ACK_TDL1 | GEN9_STATE_ACK_TDL0)
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GFX_MODE _MMIO(0x2520)
|
|
|
|
#define GFX_MODE_GEN7 _MMIO(0x229c)
|
|
|
|
#define RING_MODE_GEN7(ring) _MMIO((ring)->mmio_base+0x29c)
|
2010-12-04 11:30:53 +00:00
|
|
|
#define GFX_RUN_LIST_ENABLE (1<<15)
|
2015-08-12 14:43:42 +00:00
|
|
|
#define GFX_INTERRUPT_STEERING (1<<14)
|
2014-03-21 17:18:54 +00:00
|
|
|
#define GFX_TLB_INVALIDATE_EXPLICIT (1<<13)
|
2010-12-04 11:30:53 +00:00
|
|
|
#define GFX_SURFACE_FAULT_ENABLE (1<<12)
|
|
|
|
#define GFX_REPLAY_MODE (1<<11)
|
|
|
|
#define GFX_PSMI_GRANULARITY (1<<10)
|
|
|
|
#define GFX_PPGTT_ENABLE (1<<9)
|
2015-07-30 10:06:23 +00:00
|
|
|
#define GEN8_GFX_PPGTT_48B (1<<7)
|
2010-12-04 11:30:53 +00:00
|
|
|
|
2015-08-12 14:43:42 +00:00
|
|
|
#define GFX_FORWARD_VBLANK_MASK (3<<5)
|
|
|
|
#define GFX_FORWARD_VBLANK_NEVER (0<<5)
|
|
|
|
#define GFX_FORWARD_VBLANK_ALWAYS (1<<5)
|
|
|
|
#define GFX_FORWARD_VBLANK_COND (2<<5)
|
|
|
|
|
2012-07-11 14:27:55 +00:00
|
|
|
#define VLV_DISPLAY_BASE 0x180000
|
2014-05-19 15:24:03 +00:00
|
|
|
#define VLV_MIPI_BASE VLV_DISPLAY_BASE
|
2016-03-22 10:01:50 +00:00
|
|
|
#define BXT_MIPI_BASE 0x60000
|
2012-07-11 14:27:55 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define VLV_GU_CTL0 _MMIO(VLV_DISPLAY_BASE + 0x2030)
|
|
|
|
#define VLV_GU_CTL1 _MMIO(VLV_DISPLAY_BASE + 0x2034)
|
|
|
|
#define SCPD0 _MMIO(0x209c) /* 915+ only */
|
|
|
|
#define IER _MMIO(0x20a0)
|
|
|
|
#define IIR _MMIO(0x20a4)
|
|
|
|
#define IMR _MMIO(0x20a8)
|
|
|
|
#define ISR _MMIO(0x20ac)
|
|
|
|
#define VLV_GUNIT_CLOCK_GATE _MMIO(VLV_DISPLAY_BASE + 0x2060)
|
2014-04-09 10:28:41 +00:00
|
|
|
#define GINT_DIS (1<<22)
|
2012-10-25 19:15:44 +00:00
|
|
|
#define GCFG_DIS (1<<8)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define VLV_GUNIT_CLOCK_GATE2 _MMIO(VLV_DISPLAY_BASE + 0x2064)
|
|
|
|
#define VLV_IIR_RW _MMIO(VLV_DISPLAY_BASE + 0x2084)
|
|
|
|
#define VLV_IER _MMIO(VLV_DISPLAY_BASE + 0x20a0)
|
|
|
|
#define VLV_IIR _MMIO(VLV_DISPLAY_BASE + 0x20a4)
|
|
|
|
#define VLV_IMR _MMIO(VLV_DISPLAY_BASE + 0x20a8)
|
|
|
|
#define VLV_ISR _MMIO(VLV_DISPLAY_BASE + 0x20ac)
|
|
|
|
#define VLV_PCBR _MMIO(VLV_DISPLAY_BASE + 0x2120)
|
2014-05-23 15:30:15 +00:00
|
|
|
#define VLV_PCBR_ADDR_SHIFT 12
|
|
|
|
|
2013-02-19 21:16:44 +00:00
|
|
|
#define DISPLAY_PLANE_FLIP_PENDING(plane) (1<<(11-(plane))) /* A and B only */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define EIR _MMIO(0x20b0)
|
|
|
|
#define EMR _MMIO(0x20b4)
|
|
|
|
#define ESR _MMIO(0x20b8)
|
2009-06-18 23:56:52 +00:00
|
|
|
#define GM45_ERROR_PAGE_TABLE (1<<5)
|
|
|
|
#define GM45_ERROR_MEM_PRIV (1<<4)
|
|
|
|
#define I915_ERROR_PAGE_TABLE (1<<4)
|
|
|
|
#define GM45_ERROR_CP_PRIV (1<<3)
|
|
|
|
#define I915_ERROR_MEMORY_REFRESH (1<<1)
|
|
|
|
#define I915_ERROR_INSTRUCTION (1<<0)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define INSTPM _MMIO(0x20c0)
|
2010-01-27 11:01:11 +00:00
|
|
|
#define INSTPM_SELF_EN (1<<12) /* 915GM only */
|
2014-02-25 13:13:39 +00:00
|
|
|
#define INSTPM_AGPBUSY_INT_EN (1<<11) /* gen3: when disabled, pending interrupts
|
2011-02-05 10:08:21 +00:00
|
|
|
will not assert AGPBUSY# and will only
|
|
|
|
be delivered when out of C3. */
|
2011-12-13 03:21:58 +00:00
|
|
|
#define INSTPM_FORCE_ORDERING (1<<7) /* GEN6+ */
|
2013-08-06 18:01:14 +00:00
|
|
|
#define INSTPM_TLB_INVALIDATE (1<<9)
|
|
|
|
#define INSTPM_SYNC_FLUSH (1<<5)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define ACTHD _MMIO(0x20c8)
|
|
|
|
#define MEM_MODE _MMIO(0x20cc)
|
2014-08-14 22:21:54 +00:00
|
|
|
#define MEM_DISPLAY_B_TRICKLE_FEED_DISABLE (1<<3) /* 830 only */
|
|
|
|
#define MEM_DISPLAY_A_TRICKLE_FEED_DISABLE (1<<2) /* 830/845 only */
|
|
|
|
#define MEM_DISPLAY_TRICKLE_FEED_DISABLE (1<<2) /* 85x only */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define FW_BLC _MMIO(0x20d8)
|
|
|
|
#define FW_BLC2 _MMIO(0x20dc)
|
|
|
|
#define FW_BLC_SELF _MMIO(0x20e0) /* 915+ only */
|
2010-01-27 11:01:11 +00:00
|
|
|
#define FW_BLC_SELF_EN_MASK (1<<31)
|
|
|
|
#define FW_BLC_SELF_FIFO_MASK (1<<16) /* 945 only */
|
|
|
|
#define FW_BLC_SELF_EN (1<<15) /* 945 only */
|
2009-06-26 03:23:55 +00:00
|
|
|
#define MM_BURST_LENGTH 0x00700000
|
|
|
|
#define MM_FIFO_WATERMARK 0x0001F000
|
|
|
|
#define LM_BURST_LENGTH 0x00000700
|
|
|
|
#define LM_FIFO_WATERMARK 0x0000001F
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define MI_ARB_STATE _MMIO(0x20e4) /* 915+ only */
|
2010-07-20 04:12:35 +00:00
|
|
|
|
|
|
|
/* Make render/texture TLB fetches lower priorty than associated data
|
|
|
|
* fetches. This is not turned on by default
|
|
|
|
*/
|
|
|
|
#define MI_ARB_RENDER_TLB_LOW_PRIORITY (1 << 15)
|
|
|
|
|
|
|
|
/* Isoch request wait on GTT enable (Display A/B/C streams).
|
|
|
|
* Make isoch requests stall on the TLB update. May cause
|
|
|
|
* display underruns (test mode only)
|
|
|
|
*/
|
|
|
|
#define MI_ARB_ISOCH_WAIT_GTT (1 << 14)
|
|
|
|
|
|
|
|
/* Block grant count for isoch requests when block count is
|
|
|
|
* set to a finite value.
|
|
|
|
*/
|
|
|
|
#define MI_ARB_BLOCK_GRANT_MASK (3 << 12)
|
|
|
|
#define MI_ARB_BLOCK_GRANT_8 (0 << 12) /* for 3 display planes */
|
|
|
|
#define MI_ARB_BLOCK_GRANT_4 (1 << 12) /* for 2 display planes */
|
|
|
|
#define MI_ARB_BLOCK_GRANT_2 (2 << 12) /* for 1 display plane */
|
|
|
|
#define MI_ARB_BLOCK_GRANT_0 (3 << 12) /* don't use */
|
|
|
|
|
|
|
|
/* Enable render writes to complete in C2/C3/C4 power states.
|
|
|
|
* If this isn't enabled, render writes are prevented in low
|
|
|
|
* power states. That seems bad to me.
|
|
|
|
*/
|
|
|
|
#define MI_ARB_C3_LP_WRITE_ENABLE (1 << 11)
|
|
|
|
|
|
|
|
/* This acknowledges an async flip immediately instead
|
|
|
|
* of waiting for 2TLB fetches.
|
|
|
|
*/
|
|
|
|
#define MI_ARB_ASYNC_FLIP_ACK_IMMEDIATE (1 << 10)
|
|
|
|
|
|
|
|
/* Enables non-sequential data reads through arbiter
|
|
|
|
*/
|
2011-08-16 19:34:10 +00:00
|
|
|
#define MI_ARB_DUAL_DATA_PHASE_DISABLE (1 << 9)
|
2010-07-20 04:12:35 +00:00
|
|
|
|
|
|
|
/* Disable FSB snooping of cacheable write cycles from binner/render
|
|
|
|
* command stream
|
|
|
|
*/
|
|
|
|
#define MI_ARB_CACHE_SNOOP_DISABLE (1 << 8)
|
|
|
|
|
|
|
|
/* Arbiter time slice for non-isoch streams */
|
|
|
|
#define MI_ARB_TIME_SLICE_MASK (7 << 5)
|
|
|
|
#define MI_ARB_TIME_SLICE_1 (0 << 5)
|
|
|
|
#define MI_ARB_TIME_SLICE_2 (1 << 5)
|
|
|
|
#define MI_ARB_TIME_SLICE_4 (2 << 5)
|
|
|
|
#define MI_ARB_TIME_SLICE_6 (3 << 5)
|
|
|
|
#define MI_ARB_TIME_SLICE_8 (4 << 5)
|
|
|
|
#define MI_ARB_TIME_SLICE_10 (5 << 5)
|
|
|
|
#define MI_ARB_TIME_SLICE_14 (6 << 5)
|
|
|
|
#define MI_ARB_TIME_SLICE_16 (7 << 5)
|
|
|
|
|
|
|
|
/* Low priority grace period page size */
|
|
|
|
#define MI_ARB_LOW_PRIORITY_GRACE_4KB (0 << 4) /* default */
|
|
|
|
#define MI_ARB_LOW_PRIORITY_GRACE_8KB (1 << 4)
|
|
|
|
|
|
|
|
/* Disable display A/B trickle feed */
|
|
|
|
#define MI_ARB_DISPLAY_TRICKLE_FEED_DISABLE (1 << 2)
|
|
|
|
|
|
|
|
/* Set display plane priority */
|
|
|
|
#define MI_ARB_DISPLAY_PRIORITY_A_B (0 << 0) /* display A > display B */
|
|
|
|
#define MI_ARB_DISPLAY_PRIORITY_B_A (1 << 0) /* display B > display A */
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define MI_STATE _MMIO(0x20e4) /* gen2 only */
|
2014-02-25 13:13:40 +00:00
|
|
|
#define MI_AGPBUSY_INT_EN (1 << 1) /* 85x only */
|
|
|
|
#define MI_AGPBUSY_830_MODE (1 << 0) /* 85x only */
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define CACHE_MODE_0 _MMIO(0x2120) /* 915+ only */
|
2012-10-18 09:49:51 +00:00
|
|
|
#define CM0_PIPELINED_RENDER_FLUSH_DISABLE (1<<8)
|
2008-07-29 18:54:06 +00:00
|
|
|
#define CM0_IZ_OPT_DISABLE (1<<6)
|
|
|
|
#define CM0_ZR_OPT_DISABLE (1<<5)
|
2012-04-11 18:42:42 +00:00
|
|
|
#define CM0_STC_EVICT_DISABLE_LRA_SNB (1<<5)
|
2008-07-29 18:54:06 +00:00
|
|
|
#define CM0_DEPTH_EVICT_DISABLE (1<<4)
|
|
|
|
#define CM0_COLOR_EVICT_DISABLE (1<<3)
|
|
|
|
#define CM0_DEPTH_WRITE_DISABLE (1<<1)
|
|
|
|
#define CM0_RC_OP_FLUSH_DISABLE (1<<0)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GFX_FLSH_CNTL _MMIO(0x2170) /* 915+ only */
|
|
|
|
#define GFX_FLSH_CNTL_GEN6 _MMIO(0x101008)
|
2012-11-04 17:21:30 +00:00
|
|
|
#define GFX_FLSH_CNTL_EN (1<<0)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define ECOSKPD _MMIO(0x21d0)
|
2010-03-26 17:35:20 +00:00
|
|
|
#define ECO_GATING_CX_ONLY (1<<3)
|
|
|
|
#define ECO_FLIP_DONE (1<<0)
|
2008-07-29 18:54:06 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define CACHE_MODE_0_GEN7 _MMIO(0x7000) /* IVB+ */
|
2014-04-04 11:44:38 +00:00
|
|
|
#define RC_OP_FLUSH_ENABLE (1<<0)
|
2014-01-28 05:29:33 +00:00
|
|
|
#define HIZ_RAW_STALL_OPT_DISABLE (1<<2)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define CACHE_MODE_1 _MMIO(0x7004) /* IVB+ */
|
2014-03-26 18:41:51 +00:00
|
|
|
#define PIXEL_SUBSPAN_COLLECT_OPT_DISABLE (1<<6)
|
|
|
|
#define GEN8_4x4_STC_OPTIMIZATION_DISABLE (1<<6)
|
2015-02-09 19:33:17 +00:00
|
|
|
#define GEN9_PARTIAL_RESOLVE_IN_VC_DISABLE (1<<1)
|
2012-03-28 20:39:26 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN6_BLITTER_ECOSKPD _MMIO(0x221d0)
|
2011-01-18 19:25:41 +00:00
|
|
|
#define GEN6_BLITTER_LOCK_SHIFT 16
|
|
|
|
#define GEN6_BLITTER_FBC_NOTIFY (1<<3)
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN6_RC_SLEEP_PSMI_CONTROL _MMIO(0x2050)
|
drm/i915: Disable PSMI sleep messages on all rings around context switches
There exists a current workaround to prevent a hang on context switch
should the ring go to sleep in the middle of the restore,
WaProgramMiArbOnOffAroundMiSetContext (applicable to all gen7+). In
spite of disabling arbitration (which prevents the ring from powering
down during the critical section) we were still hitting hangs that had
the hallmarks of the known erratum. That is we are still seeing hangs
"on the last instruction in the context restore". By comparing -nightly
(broken) with requests (working), we were able to deduce that it was the
semaphore LRI cross-talk that reproduced the original failure. The key
was that requests implemented deferred semaphore signalling, and
disabling that, i.e. emitting the semaphore signal to every other ring
after every batch restored the frequent hang. Explicitly disabling PSMI
sleep on the RCS ring was insufficient, all the rings had to be awake to
prevent the hangs. Fortunately, we can reduce the wakelock to the
MI_SET_CONTEXT operation itself, and so should be able to limit the extra
power implications.
Since the MI_ARB_ON_OFF workaround is listed for all gen7 and above
products, we should apply this extra hammer for all of the same
platforms despite so far that we have only been able to reproduce the
hang on certain ivb and hsw models. The last question is whether we want
to always use the extra hammer or only when we know semaphores are in
operation. At the moment, we only use LRI on non-RCS rings for
semaphores, but that may change in the future with the possibility of
reintroducing this bug under subtle conditions.
v2: Make it explicit that the PSMI LRI are an extension to the original
workaround for the other rings.
v3: Bikeshedding variable names and whitespacing
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=80660
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=83677
Cc: Simon Farnsworth <simon@farnz.org.uk>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Tested-by: Peter Frühberger <fritsch@xbmc.org>
Reviewed-by: Daniel Vetter <daniel@ffwll.ch>
Cc: stable@vger.kernel.org
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
2014-12-16 10:02:27 +00:00
|
|
|
#define GEN6_PSMI_SLEEP_MSG_DISABLE (1 << 0)
|
2014-02-27 19:59:01 +00:00
|
|
|
#define GEN8_RC_SEMA_IDLE_MSG_DISABLE (1 << 12)
|
2014-04-09 10:28:41 +00:00
|
|
|
#define GEN8_FF_DOP_CLOCK_GATE_DISABLE (1<<10)
|
2014-02-27 19:59:01 +00:00
|
|
|
|
2015-01-16 15:12:16 +00:00
|
|
|
/* Fuse readout registers for GT */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define CHV_FUSE_GT _MMIO(VLV_DISPLAY_BASE + 0x2168)
|
2015-02-27 20:12:28 +00:00
|
|
|
#define CHV_FGT_DISABLE_SS0 (1 << 10)
|
|
|
|
#define CHV_FGT_DISABLE_SS1 (1 << 11)
|
2015-01-16 15:12:16 +00:00
|
|
|
#define CHV_FGT_EU_DIS_SS0_R0_SHIFT 16
|
|
|
|
#define CHV_FGT_EU_DIS_SS0_R0_MASK (0xf << CHV_FGT_EU_DIS_SS0_R0_SHIFT)
|
|
|
|
#define CHV_FGT_EU_DIS_SS0_R1_SHIFT 20
|
|
|
|
#define CHV_FGT_EU_DIS_SS0_R1_MASK (0xf << CHV_FGT_EU_DIS_SS0_R1_SHIFT)
|
|
|
|
#define CHV_FGT_EU_DIS_SS1_R0_SHIFT 24
|
|
|
|
#define CHV_FGT_EU_DIS_SS1_R0_MASK (0xf << CHV_FGT_EU_DIS_SS1_R0_SHIFT)
|
|
|
|
#define CHV_FGT_EU_DIS_SS1_R1_SHIFT 28
|
|
|
|
#define CHV_FGT_EU_DIS_SS1_R1_MASK (0xf << CHV_FGT_EU_DIS_SS1_R1_SHIFT)
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN8_FUSE2 _MMIO(0x9120)
|
2015-09-25 09:54:58 +00:00
|
|
|
#define GEN8_F2_SS_DIS_SHIFT 21
|
|
|
|
#define GEN8_F2_SS_DIS_MASK (0x7 << GEN8_F2_SS_DIS_SHIFT)
|
2015-02-13 16:27:54 +00:00
|
|
|
#define GEN8_F2_S_ENA_SHIFT 25
|
|
|
|
#define GEN8_F2_S_ENA_MASK (0x7 << GEN8_F2_S_ENA_SHIFT)
|
|
|
|
|
|
|
|
#define GEN9_F2_SS_DIS_SHIFT 20
|
|
|
|
#define GEN9_F2_SS_DIS_MASK (0xf << GEN9_F2_SS_DIS_SHIFT)
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN8_EU_DISABLE0 _MMIO(0x9134)
|
2015-09-25 09:54:58 +00:00
|
|
|
#define GEN8_EU_DIS0_S0_MASK 0xffffff
|
|
|
|
#define GEN8_EU_DIS0_S1_SHIFT 24
|
|
|
|
#define GEN8_EU_DIS0_S1_MASK (0xff << GEN8_EU_DIS0_S1_SHIFT)
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN8_EU_DISABLE1 _MMIO(0x9138)
|
2015-09-25 09:54:58 +00:00
|
|
|
#define GEN8_EU_DIS1_S1_MASK 0xffff
|
|
|
|
#define GEN8_EU_DIS1_S2_SHIFT 16
|
|
|
|
#define GEN8_EU_DIS1_S2_MASK (0xffff << GEN8_EU_DIS1_S2_SHIFT)
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN8_EU_DISABLE2 _MMIO(0x913c)
|
2015-09-25 09:54:58 +00:00
|
|
|
#define GEN8_EU_DIS2_S2_MASK 0xff
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN9_EU_DISABLE(slice) _MMIO(0x9134 + (slice)*0x4)
|
2015-02-13 16:27:54 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN6_BSD_SLEEP_PSMI_CONTROL _MMIO(0x12050)
|
2012-07-05 16:14:01 +00:00
|
|
|
#define GEN6_BSD_SLEEP_MSG_DISABLE (1 << 0)
|
|
|
|
#define GEN6_BSD_SLEEP_FLUSH_DISABLE (1 << 2)
|
|
|
|
#define GEN6_BSD_SLEEP_INDICATOR (1 << 3)
|
|
|
|
#define GEN6_BSD_GO_INDICATOR (1 << 4)
|
2010-09-19 13:40:43 +00:00
|
|
|
|
2013-05-29 02:22:29 +00:00
|
|
|
/* On modern GEN architectures interrupt control consists of two sets
|
|
|
|
* of registers. The first set pertains to the ring generating the
|
|
|
|
* interrupt. The second control is for the functional block generating the
|
|
|
|
* interrupt. These are PM, GT, DE, etc.
|
|
|
|
*
|
|
|
|
* Luckily *knocks on wood* all the ring interrupt bits match up with the
|
|
|
|
* GT interrupt bits, so we don't need to duplicate the defines.
|
|
|
|
*
|
|
|
|
* These defines should cover us well from SNB->HSW with minor exceptions
|
|
|
|
* it can also work on ILK.
|
|
|
|
*/
|
|
|
|
#define GT_BLT_FLUSHDW_NOTIFY_INTERRUPT (1 << 26)
|
|
|
|
#define GT_BLT_CS_ERROR_INTERRUPT (1 << 25)
|
|
|
|
#define GT_BLT_USER_INTERRUPT (1 << 22)
|
|
|
|
#define GT_BSD_CS_ERROR_INTERRUPT (1 << 15)
|
|
|
|
#define GT_BSD_USER_INTERRUPT (1 << 12)
|
2013-09-19 18:13:41 +00:00
|
|
|
#define GT_RENDER_L3_PARITY_ERROR_INTERRUPT_S1 (1 << 11) /* hsw+; rsvd on snb, ivb, vlv */
|
2014-07-24 16:04:31 +00:00
|
|
|
#define GT_CONTEXT_SWITCH_INTERRUPT (1 << 8)
|
2013-05-29 02:22:29 +00:00
|
|
|
#define GT_RENDER_L3_PARITY_ERROR_INTERRUPT (1 << 5) /* !snb */
|
|
|
|
#define GT_RENDER_PIPECTL_NOTIFY_INTERRUPT (1 << 4)
|
|
|
|
#define GT_RENDER_CS_MASTER_ERROR_INTERRUPT (1 << 3)
|
|
|
|
#define GT_RENDER_SYNC_STATUS_INTERRUPT (1 << 2)
|
|
|
|
#define GT_RENDER_DEBUG_INTERRUPT (1 << 1)
|
|
|
|
#define GT_RENDER_USER_INTERRUPT (1 << 0)
|
|
|
|
|
2013-05-29 02:22:31 +00:00
|
|
|
#define PM_VEBOX_CS_ERROR_INTERRUPT (1 << 12) /* hsw+ */
|
|
|
|
#define PM_VEBOX_USER_INTERRUPT (1 << 10) /* hsw+ */
|
|
|
|
|
2013-09-19 18:13:41 +00:00
|
|
|
#define GT_PARITY_ERROR(dev) \
|
|
|
|
(GT_RENDER_L3_PARITY_ERROR_INTERRUPT | \
|
2013-09-24 07:57:35 +00:00
|
|
|
(IS_HASWELL(dev) ? GT_RENDER_L3_PARITY_ERROR_INTERRUPT_S1 : 0))
|
2013-09-19 18:13:41 +00:00
|
|
|
|
2013-05-29 02:22:29 +00:00
|
|
|
/* These are all the "old" interrupts */
|
|
|
|
#define ILK_BSD_USER_INTERRUPT (1<<5)
|
2014-04-09 10:28:06 +00:00
|
|
|
|
|
|
|
#define I915_PM_INTERRUPT (1<<31)
|
|
|
|
#define I915_ISP_INTERRUPT (1<<22)
|
|
|
|
#define I915_LPE_PIPE_B_INTERRUPT (1<<21)
|
|
|
|
#define I915_LPE_PIPE_A_INTERRUPT (1<<20)
|
2014-11-14 14:54:21 +00:00
|
|
|
#define I915_MIPIC_INTERRUPT (1<<19)
|
2014-04-09 10:28:06 +00:00
|
|
|
#define I915_MIPIA_INTERRUPT (1<<18)
|
2013-05-29 02:22:29 +00:00
|
|
|
#define I915_PIPE_CONTROL_NOTIFY_INTERRUPT (1<<18)
|
|
|
|
#define I915_DISPLAY_PORT_INTERRUPT (1<<17)
|
2014-04-09 10:28:06 +00:00
|
|
|
#define I915_DISPLAY_PIPE_C_HBLANK_INTERRUPT (1<<16)
|
|
|
|
#define I915_MASTER_ERROR_INTERRUPT (1<<15)
|
2013-05-29 02:22:29 +00:00
|
|
|
#define I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT (1<<15)
|
2014-04-09 10:28:06 +00:00
|
|
|
#define I915_DISPLAY_PIPE_B_HBLANK_INTERRUPT (1<<14)
|
2013-05-29 02:22:29 +00:00
|
|
|
#define I915_GMCH_THERMAL_SENSOR_EVENT_INTERRUPT (1<<14) /* p-state */
|
2014-04-09 10:28:06 +00:00
|
|
|
#define I915_DISPLAY_PIPE_A_HBLANK_INTERRUPT (1<<13)
|
2013-05-29 02:22:29 +00:00
|
|
|
#define I915_HWB_OOM_INTERRUPT (1<<13)
|
2014-04-09 10:28:06 +00:00
|
|
|
#define I915_LPE_PIPE_C_INTERRUPT (1<<12)
|
2013-05-29 02:22:29 +00:00
|
|
|
#define I915_SYNC_STATUS_INTERRUPT (1<<12)
|
2014-04-09 10:28:06 +00:00
|
|
|
#define I915_MISC_INTERRUPT (1<<11)
|
2013-05-29 02:22:29 +00:00
|
|
|
#define I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT (1<<11)
|
2014-04-09 10:28:06 +00:00
|
|
|
#define I915_DISPLAY_PIPE_C_VBLANK_INTERRUPT (1<<10)
|
2013-05-29 02:22:29 +00:00
|
|
|
#define I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT (1<<10)
|
2014-04-09 10:28:06 +00:00
|
|
|
#define I915_DISPLAY_PIPE_C_EVENT_INTERRUPT (1<<9)
|
2013-05-29 02:22:29 +00:00
|
|
|
#define I915_OVERLAY_PLANE_FLIP_PENDING_INTERRUPT (1<<9)
|
2014-04-09 10:28:06 +00:00
|
|
|
#define I915_DISPLAY_PIPE_C_DPBM_INTERRUPT (1<<8)
|
2013-05-29 02:22:29 +00:00
|
|
|
#define I915_DISPLAY_PLANE_C_FLIP_PENDING_INTERRUPT (1<<8)
|
|
|
|
#define I915_DISPLAY_PIPE_A_VBLANK_INTERRUPT (1<<7)
|
|
|
|
#define I915_DISPLAY_PIPE_A_EVENT_INTERRUPT (1<<6)
|
|
|
|
#define I915_DISPLAY_PIPE_B_VBLANK_INTERRUPT (1<<5)
|
|
|
|
#define I915_DISPLAY_PIPE_B_EVENT_INTERRUPT (1<<4)
|
2014-04-09 10:28:06 +00:00
|
|
|
#define I915_DISPLAY_PIPE_A_DPBM_INTERRUPT (1<<3)
|
|
|
|
#define I915_DISPLAY_PIPE_B_DPBM_INTERRUPT (1<<2)
|
2013-05-29 02:22:29 +00:00
|
|
|
#define I915_DEBUG_INTERRUPT (1<<2)
|
2014-04-09 10:28:06 +00:00
|
|
|
#define I915_WINVALID_INTERRUPT (1<<1)
|
2013-05-29 02:22:29 +00:00
|
|
|
#define I915_USER_INTERRUPT (1<<1)
|
|
|
|
#define I915_ASLE_INTERRUPT (1<<0)
|
2014-04-09 10:28:06 +00:00
|
|
|
#define I915_BSD_USER_INTERRUPT (1<<25)
|
2010-09-19 13:40:43 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN6_BSD_RNCID _MMIO(0x12198)
|
2010-09-19 13:40:43 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN7_FF_THREAD_MODE _MMIO(0x20a0)
|
2012-04-15 01:41:32 +00:00
|
|
|
#define GEN7_FF_SCHED_MASK 0x0077070
|
2013-12-12 23:28:04 +00:00
|
|
|
#define GEN8_FF_DS_REF_CNT_FFME (1 << 19)
|
2012-04-15 01:41:32 +00:00
|
|
|
#define GEN7_FF_TS_SCHED_HS1 (0x5<<16)
|
|
|
|
#define GEN7_FF_TS_SCHED_HS0 (0x3<<16)
|
|
|
|
#define GEN7_FF_TS_SCHED_LOAD_BALANCE (0x1<<16)
|
|
|
|
#define GEN7_FF_TS_SCHED_HW (0x0<<16) /* Default */
|
2013-01-26 19:52:00 +00:00
|
|
|
#define GEN7_FF_VS_REF_CNT_FFME (1 << 15)
|
2012-04-15 01:41:32 +00:00
|
|
|
#define GEN7_FF_VS_SCHED_HS1 (0x5<<12)
|
|
|
|
#define GEN7_FF_VS_SCHED_HS0 (0x3<<12)
|
|
|
|
#define GEN7_FF_VS_SCHED_LOAD_BALANCE (0x1<<12) /* Default */
|
|
|
|
#define GEN7_FF_VS_SCHED_HW (0x0<<12)
|
|
|
|
#define GEN7_FF_DS_SCHED_HS1 (0x5<<4)
|
|
|
|
#define GEN7_FF_DS_SCHED_HS0 (0x3<<4)
|
|
|
|
#define GEN7_FF_DS_SCHED_LOAD_BALANCE (0x1<<4) /* Default */
|
|
|
|
#define GEN7_FF_DS_SCHED_HW (0x0<<4)
|
|
|
|
|
2008-07-29 18:54:06 +00:00
|
|
|
/*
|
|
|
|
* Framebuffer compression (915+ only)
|
|
|
|
*/
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define FBC_CFB_BASE _MMIO(0x3200) /* 4k page aligned */
|
|
|
|
#define FBC_LL_BASE _MMIO(0x3204) /* 4k page aligned */
|
|
|
|
#define FBC_CONTROL _MMIO(0x3208)
|
2008-07-29 18:54:06 +00:00
|
|
|
#define FBC_CTL_EN (1<<31)
|
|
|
|
#define FBC_CTL_PERIODIC (1<<30)
|
|
|
|
#define FBC_CTL_INTERVAL_SHIFT (16)
|
|
|
|
#define FBC_CTL_UNCOMPRESSIBLE (1<<14)
|
2010-03-02 09:37:00 +00:00
|
|
|
#define FBC_CTL_C3_IDLE (1<<13)
|
2008-07-29 18:54:06 +00:00
|
|
|
#define FBC_CTL_STRIDE_SHIFT (5)
|
2013-11-28 15:29:55 +00:00
|
|
|
#define FBC_CTL_FENCENO_SHIFT (0)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define FBC_COMMAND _MMIO(0x320c)
|
2008-07-29 18:54:06 +00:00
|
|
|
#define FBC_CMD_COMPRESS (1<<0)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define FBC_STATUS _MMIO(0x3210)
|
2008-07-29 18:54:06 +00:00
|
|
|
#define FBC_STAT_COMPRESSING (1<<31)
|
|
|
|
#define FBC_STAT_COMPRESSED (1<<30)
|
|
|
|
#define FBC_STAT_MODIFIED (1<<29)
|
2013-11-28 15:29:55 +00:00
|
|
|
#define FBC_STAT_CURRENT_LINE_SHIFT (0)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define FBC_CONTROL2 _MMIO(0x3214)
|
2008-07-29 18:54:06 +00:00
|
|
|
#define FBC_CTL_FENCE_DBL (0<<4)
|
|
|
|
#define FBC_CTL_IDLE_IMM (0<<2)
|
|
|
|
#define FBC_CTL_IDLE_FULL (1<<2)
|
|
|
|
#define FBC_CTL_IDLE_LINE (2<<2)
|
|
|
|
#define FBC_CTL_IDLE_DEBUG (3<<2)
|
|
|
|
#define FBC_CTL_CPU_FENCE (1<<1)
|
2014-01-23 14:49:11 +00:00
|
|
|
#define FBC_CTL_PLANE(plane) ((plane)<<0)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define FBC_FENCE_OFF _MMIO(0x3218) /* BSpec typo has 321Bh */
|
|
|
|
#define FBC_TAG(i) _MMIO(0x3300 + (i) * 4)
|
2008-07-29 18:54:06 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define FBC_STATUS2 _MMIO(0x43214)
|
2015-06-12 17:36:18 +00:00
|
|
|
#define FBC_COMPRESSION_MASK 0x7ff
|
|
|
|
|
2008-07-29 18:54:06 +00:00
|
|
|
#define FBC_LL_SIZE (1536)
|
|
|
|
|
2009-09-14 22:39:40 +00:00
|
|
|
/* Framebuffer compression for GM45+ */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define DPFC_CB_BASE _MMIO(0x3200)
|
|
|
|
#define DPFC_CONTROL _MMIO(0x3208)
|
2009-09-14 22:39:40 +00:00
|
|
|
#define DPFC_CTL_EN (1<<31)
|
2014-01-23 14:49:11 +00:00
|
|
|
#define DPFC_CTL_PLANE(plane) ((plane)<<30)
|
|
|
|
#define IVB_DPFC_CTL_PLANE(plane) ((plane)<<29)
|
2009-09-14 22:39:40 +00:00
|
|
|
#define DPFC_CTL_FENCE_EN (1<<29)
|
2013-05-06 22:37:33 +00:00
|
|
|
#define IVB_DPFC_CTL_FENCE_EN (1<<28)
|
2011-07-08 11:22:40 +00:00
|
|
|
#define DPFC_CTL_PERSISTENT_MODE (1<<25)
|
2009-09-14 22:39:40 +00:00
|
|
|
#define DPFC_SR_EN (1<<10)
|
|
|
|
#define DPFC_CTL_LIMIT_1X (0<<6)
|
|
|
|
#define DPFC_CTL_LIMIT_2X (1<<6)
|
|
|
|
#define DPFC_CTL_LIMIT_4X (2<<6)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define DPFC_RECOMP_CTL _MMIO(0x320c)
|
2009-09-14 22:39:40 +00:00
|
|
|
#define DPFC_RECOMP_STALL_EN (1<<27)
|
|
|
|
#define DPFC_RECOMP_STALL_WM_SHIFT (16)
|
|
|
|
#define DPFC_RECOMP_STALL_WM_MASK (0x07ff0000)
|
|
|
|
#define DPFC_RECOMP_TIMER_COUNT_SHIFT (0)
|
|
|
|
#define DPFC_RECOMP_TIMER_COUNT_MASK (0x0000003f)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define DPFC_STATUS _MMIO(0x3210)
|
2009-09-14 22:39:40 +00:00
|
|
|
#define DPFC_INVAL_SEG_SHIFT (16)
|
|
|
|
#define DPFC_INVAL_SEG_MASK (0x07ff0000)
|
|
|
|
#define DPFC_COMP_SEG_SHIFT (0)
|
|
|
|
#define DPFC_COMP_SEG_MASK (0x000003ff)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define DPFC_STATUS2 _MMIO(0x3214)
|
|
|
|
#define DPFC_FENCE_YOFF _MMIO(0x3218)
|
|
|
|
#define DPFC_CHICKEN _MMIO(0x3224)
|
2009-09-14 22:39:40 +00:00
|
|
|
#define DPFC_HT_MODIFY (1<<31)
|
|
|
|
|
2010-06-12 06:32:27 +00:00
|
|
|
/* Framebuffer compression for Ironlake */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define ILK_DPFC_CB_BASE _MMIO(0x43200)
|
|
|
|
#define ILK_DPFC_CONTROL _MMIO(0x43208)
|
2014-08-01 09:04:45 +00:00
|
|
|
#define FBC_CTL_FALSE_COLOR (1<<10)
|
2010-06-12 06:32:27 +00:00
|
|
|
/* The bit 28-8 is reserved */
|
|
|
|
#define DPFC_RESERVED (0x1FFFFF00)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define ILK_DPFC_RECOMP_CTL _MMIO(0x4320c)
|
|
|
|
#define ILK_DPFC_STATUS _MMIO(0x43210)
|
|
|
|
#define ILK_DPFC_FENCE_YOFF _MMIO(0x43218)
|
|
|
|
#define ILK_DPFC_CHICKEN _MMIO(0x43224)
|
|
|
|
#define ILK_FBC_RT_BASE _MMIO(0x2128)
|
2010-06-12 06:32:27 +00:00
|
|
|
#define ILK_FBC_RT_VALID (1<<0)
|
2013-05-06 22:37:33 +00:00
|
|
|
#define SNB_FBC_FRONT_BUFFER (1<<1)
|
2010-06-12 06:32:27 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define ILK_DISPLAY_CHICKEN1 _MMIO(0x42000)
|
2010-06-12 06:32:27 +00:00
|
|
|
#define ILK_FBCQ_DIS (1<<22)
|
2011-08-16 19:34:10 +00:00
|
|
|
#define ILK_PABSTRETCH_DIS (1<<21)
|
2010-12-15 07:42:31 +00:00
|
|
|
|
2010-06-12 06:32:27 +00:00
|
|
|
|
2010-12-15 07:42:32 +00:00
|
|
|
/*
|
|
|
|
* Framebuffer compression for Sandybridge
|
|
|
|
*
|
|
|
|
* The following two registers are of type GTTMMADR
|
|
|
|
*/
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define SNB_DPFC_CTL_SA _MMIO(0x100100)
|
2010-12-15 07:42:32 +00:00
|
|
|
#define SNB_CPU_FENCE_ENABLE (1<<29)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define DPFC_CPU_FENCE_OFFSET _MMIO(0x100104)
|
2010-12-15 07:42:32 +00:00
|
|
|
|
2013-05-06 22:37:33 +00:00
|
|
|
/* Framebuffer compression for Ivybridge */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define IVB_FBC_RT_BASE _MMIO(0x7020)
|
2013-05-06 22:37:33 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define IPS_CTL _MMIO(0x43408)
|
2013-05-31 19:33:22 +00:00
|
|
|
#define IPS_ENABLE (1 << 31)
|
2010-12-15 07:42:32 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define MSG_FBC_REND_STATE _MMIO(0x50380)
|
2013-06-06 19:58:16 +00:00
|
|
|
#define FBC_REND_NUKE (1<<2)
|
|
|
|
#define FBC_REND_CACHE_CLEAN (1<<1)
|
|
|
|
|
2008-07-29 18:54:06 +00:00
|
|
|
/*
|
|
|
|
* GPIO regs
|
|
|
|
*/
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GPIOA _MMIO(0x5010)
|
|
|
|
#define GPIOB _MMIO(0x5014)
|
|
|
|
#define GPIOC _MMIO(0x5018)
|
|
|
|
#define GPIOD _MMIO(0x501c)
|
|
|
|
#define GPIOE _MMIO(0x5020)
|
|
|
|
#define GPIOF _MMIO(0x5024)
|
|
|
|
#define GPIOG _MMIO(0x5028)
|
|
|
|
#define GPIOH _MMIO(0x502c)
|
2008-07-29 18:54:06 +00:00
|
|
|
# define GPIO_CLOCK_DIR_MASK (1 << 0)
|
|
|
|
# define GPIO_CLOCK_DIR_IN (0 << 1)
|
|
|
|
# define GPIO_CLOCK_DIR_OUT (1 << 1)
|
|
|
|
# define GPIO_CLOCK_VAL_MASK (1 << 2)
|
|
|
|
# define GPIO_CLOCK_VAL_OUT (1 << 3)
|
|
|
|
# define GPIO_CLOCK_VAL_IN (1 << 4)
|
|
|
|
# define GPIO_CLOCK_PULLUP_DISABLE (1 << 5)
|
|
|
|
# define GPIO_DATA_DIR_MASK (1 << 8)
|
|
|
|
# define GPIO_DATA_DIR_IN (0 << 9)
|
|
|
|
# define GPIO_DATA_DIR_OUT (1 << 9)
|
|
|
|
# define GPIO_DATA_VAL_MASK (1 << 10)
|
|
|
|
# define GPIO_DATA_VAL_OUT (1 << 11)
|
|
|
|
# define GPIO_DATA_VAL_IN (1 << 12)
|
|
|
|
# define GPIO_DATA_PULLUP_DISABLE (1 << 13)
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GMBUS0 _MMIO(dev_priv->gpio_mmio_base + 0x5100) /* clock/port select */
|
2010-07-20 22:44:45 +00:00
|
|
|
#define GMBUS_RATE_100KHZ (0<<8)
|
|
|
|
#define GMBUS_RATE_50KHZ (1<<8)
|
|
|
|
#define GMBUS_RATE_400KHZ (2<<8) /* reserved on Pineview */
|
|
|
|
#define GMBUS_RATE_1MHZ (3<<8) /* reserved on Pineview */
|
|
|
|
#define GMBUS_HOLD_EXT (1<<7) /* 300ns hold time, rsvd on Pineview */
|
2015-03-26 22:20:19 +00:00
|
|
|
#define GMBUS_PIN_DISABLED 0
|
|
|
|
#define GMBUS_PIN_SSC 1
|
|
|
|
#define GMBUS_PIN_VGADDC 2
|
|
|
|
#define GMBUS_PIN_PANEL 3
|
|
|
|
#define GMBUS_PIN_DPD_CHV 3 /* HDMID_CHV */
|
|
|
|
#define GMBUS_PIN_DPC 4 /* HDMIC */
|
|
|
|
#define GMBUS_PIN_DPB 5 /* SDVO, HDMIB */
|
|
|
|
#define GMBUS_PIN_DPD 6 /* HDMID */
|
|
|
|
#define GMBUS_PIN_RESERVED 7 /* 7 reserved */
|
2015-04-01 07:58:05 +00:00
|
|
|
#define GMBUS_PIN_1_BXT 1
|
|
|
|
#define GMBUS_PIN_2_BXT 2
|
|
|
|
#define GMBUS_PIN_3_BXT 3
|
2015-04-01 07:55:04 +00:00
|
|
|
#define GMBUS_NUM_PINS 7 /* including 0 */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GMBUS1 _MMIO(dev_priv->gpio_mmio_base + 0x5104) /* command/status */
|
2010-07-20 22:44:45 +00:00
|
|
|
#define GMBUS_SW_CLR_INT (1<<31)
|
|
|
|
#define GMBUS_SW_RDY (1<<30)
|
|
|
|
#define GMBUS_ENT (1<<29) /* enable timeout */
|
|
|
|
#define GMBUS_CYCLE_NONE (0<<25)
|
|
|
|
#define GMBUS_CYCLE_WAIT (1<<25)
|
|
|
|
#define GMBUS_CYCLE_INDEX (2<<25)
|
|
|
|
#define GMBUS_CYCLE_STOP (4<<25)
|
|
|
|
#define GMBUS_BYTE_COUNT_SHIFT 16
|
2015-04-21 16:49:11 +00:00
|
|
|
#define GMBUS_BYTE_COUNT_MAX 256U
|
2010-07-20 22:44:45 +00:00
|
|
|
#define GMBUS_SLAVE_INDEX_SHIFT 8
|
|
|
|
#define GMBUS_SLAVE_ADDR_SHIFT 1
|
|
|
|
#define GMBUS_SLAVE_READ (1<<0)
|
|
|
|
#define GMBUS_SLAVE_WRITE (0<<0)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GMBUS2 _MMIO(dev_priv->gpio_mmio_base + 0x5108) /* status */
|
2010-07-20 22:44:45 +00:00
|
|
|
#define GMBUS_INUSE (1<<15)
|
|
|
|
#define GMBUS_HW_WAIT_PHASE (1<<14)
|
|
|
|
#define GMBUS_STALL_TIMEOUT (1<<13)
|
|
|
|
#define GMBUS_INT (1<<12)
|
|
|
|
#define GMBUS_HW_RDY (1<<11)
|
|
|
|
#define GMBUS_SATOER (1<<10)
|
|
|
|
#define GMBUS_ACTIVE (1<<9)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GMBUS3 _MMIO(dev_priv->gpio_mmio_base + 0x510c) /* data buffer bytes 3-0 */
|
|
|
|
#define GMBUS4 _MMIO(dev_priv->gpio_mmio_base + 0x5110) /* interrupt mask (Pineview+) */
|
2010-07-20 22:44:45 +00:00
|
|
|
#define GMBUS_SLAVE_TIMEOUT_EN (1<<4)
|
|
|
|
#define GMBUS_NAK_EN (1<<3)
|
|
|
|
#define GMBUS_IDLE_EN (1<<2)
|
|
|
|
#define GMBUS_HW_WAIT_EN (1<<1)
|
|
|
|
#define GMBUS_HW_RDY_EN (1<<0)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GMBUS5 _MMIO(dev_priv->gpio_mmio_base + 0x5120) /* byte index */
|
2010-07-20 22:44:45 +00:00
|
|
|
#define GMBUS_2BYTE_INDEX_EN (1<<31)
|
2009-12-01 19:56:30 +00:00
|
|
|
|
2008-07-29 18:54:06 +00:00
|
|
|
/*
|
|
|
|
* Clock control & power management
|
|
|
|
*/
|
2014-04-09 10:29:08 +00:00
|
|
|
#define _DPLL_A (dev_priv->info.display_mmio_offset + 0x6014)
|
|
|
|
#define _DPLL_B (dev_priv->info.display_mmio_offset + 0x6018)
|
|
|
|
#define _CHV_DPLL_C (dev_priv->info.display_mmio_offset + 0x6030)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define DPLL(pipe) _MMIO_PIPE3((pipe), _DPLL_A, _DPLL_B, _CHV_DPLL_C)
|
2008-07-29 18:54:06 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define VGA0 _MMIO(0x6000)
|
|
|
|
#define VGA1 _MMIO(0x6004)
|
|
|
|
#define VGA_PD _MMIO(0x6010)
|
2008-07-29 18:54:06 +00:00
|
|
|
#define VGA0_PD_P2_DIV_4 (1 << 7)
|
|
|
|
#define VGA0_PD_P1_DIV_2 (1 << 5)
|
|
|
|
#define VGA0_PD_P1_SHIFT 0
|
|
|
|
#define VGA0_PD_P1_MASK (0x1f << 0)
|
|
|
|
#define VGA1_PD_P2_DIV_4 (1 << 15)
|
|
|
|
#define VGA1_PD_P1_DIV_2 (1 << 13)
|
|
|
|
#define VGA1_PD_P1_SHIFT 8
|
|
|
|
#define VGA1_PD_P1_MASK (0x1f << 8)
|
|
|
|
#define DPLL_VCO_ENABLE (1 << 31)
|
2013-07-06 10:52:05 +00:00
|
|
|
#define DPLL_SDVO_HIGH_SPEED (1 << 30)
|
|
|
|
#define DPLL_DVO_2X_MODE (1 << 30)
|
2012-03-28 20:39:23 +00:00
|
|
|
#define DPLL_EXT_BUFFER_ENABLE_VLV (1 << 30)
|
2008-07-29 18:54:06 +00:00
|
|
|
#define DPLL_SYNCLOCK_ENABLE (1 << 29)
|
2015-06-29 12:25:49 +00:00
|
|
|
#define DPLL_REF_CLK_ENABLE_VLV (1 << 29)
|
2008-07-29 18:54:06 +00:00
|
|
|
#define DPLL_VGA_MODE_DIS (1 << 28)
|
|
|
|
#define DPLLB_MODE_DAC_SERIAL (1 << 26) /* i915 */
|
|
|
|
#define DPLLB_MODE_LVDS (2 << 26) /* i915 */
|
|
|
|
#define DPLL_MODE_MASK (3 << 26)
|
|
|
|
#define DPLL_DAC_SERIAL_P2_CLOCK_DIV_10 (0 << 24) /* i915 */
|
|
|
|
#define DPLL_DAC_SERIAL_P2_CLOCK_DIV_5 (1 << 24) /* i915 */
|
|
|
|
#define DPLLB_LVDS_P2_CLOCK_DIV_14 (0 << 24) /* i915 */
|
|
|
|
#define DPLLB_LVDS_P2_CLOCK_DIV_7 (1 << 24) /* i915 */
|
|
|
|
#define DPLL_P2_CLOCK_DIV_MASK 0x03000000 /* i915 */
|
|
|
|
#define DPLL_FPA01_P1_POST_DIV_MASK 0x00ff0000 /* i915 */
|
2009-12-03 22:14:42 +00:00
|
|
|
#define DPLL_FPA01_P1_POST_DIV_MASK_PINEVIEW 0x00ff8000 /* Pineview */
|
2012-06-15 18:55:13 +00:00
|
|
|
#define DPLL_LOCK_VLV (1<<15)
|
2013-04-18 20:01:46 +00:00
|
|
|
#define DPLL_INTEGRATED_CRI_CLK_VLV (1<<14)
|
2015-06-29 12:25:49 +00:00
|
|
|
#define DPLL_INTEGRATED_REF_CLK_VLV (1<<13)
|
|
|
|
#define DPLL_SSC_REF_CLK_CHV (1<<13)
|
2013-04-18 20:01:46 +00:00
|
|
|
#define DPLL_PORTC_READY_MASK (0xf << 4)
|
|
|
|
#define DPLL_PORTB_READY_MASK (0xf)
|
2008-07-29 18:54:06 +00:00
|
|
|
|
|
|
|
#define DPLL_FPA01_P1_POST_DIV_MASK_I830 0x001f0000
|
2014-04-09 10:28:15 +00:00
|
|
|
|
|
|
|
/* Additional CHV pll/phy registers */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define DPIO_PHY_STATUS _MMIO(VLV_DISPLAY_BASE + 0x6240)
|
2014-04-09 10:28:15 +00:00
|
|
|
#define DPLL_PORTD_READY_MASK (0xf)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define DISPLAY_PHY_CONTROL _MMIO(VLV_DISPLAY_BASE + 0x60100)
|
2015-07-08 20:45:54 +00:00
|
|
|
#define PHY_CH_POWER_DOWN_OVRD_EN(phy, ch) (1 << (2*(phy)+(ch)+27))
|
2015-05-26 17:22:38 +00:00
|
|
|
#define PHY_LDO_DELAY_0NS 0x0
|
|
|
|
#define PHY_LDO_DELAY_200NS 0x1
|
|
|
|
#define PHY_LDO_DELAY_600NS 0x2
|
|
|
|
#define PHY_LDO_SEQ_DELAY(delay, phy) ((delay) << (2*(phy)+23))
|
2015-07-08 20:45:54 +00:00
|
|
|
#define PHY_CH_POWER_DOWN_OVRD(mask, phy, ch) ((mask) << (8*(phy)+4*(ch)+11))
|
2015-04-10 15:21:28 +00:00
|
|
|
#define PHY_CH_SU_PSR 0x1
|
|
|
|
#define PHY_CH_DEEP_PSR 0x7
|
|
|
|
#define PHY_CH_POWER_MODE(mode, phy, ch) ((mode) << (6*(phy)+3*(ch)+2))
|
|
|
|
#define PHY_COM_LANE_RESET_DEASSERT(phy) (1 << (phy))
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define DISPLAY_PHY_STATUS _MMIO(VLV_DISPLAY_BASE + 0x60104)
|
2014-06-27 16:52:13 +00:00
|
|
|
#define PHY_POWERGOOD(phy) (((phy) == DPIO_PHY0) ? (1<<31) : (1<<30))
|
2015-07-08 20:46:01 +00:00
|
|
|
#define PHY_STATUS_CMN_LDO(phy, ch) (1 << (6-(6*(phy)+3*(ch))))
|
|
|
|
#define PHY_STATUS_SPLINE_LDO(phy, ch, spline) (1 << (8-(6*(phy)+3*(ch)+(spline))))
|
2014-04-09 10:28:17 +00:00
|
|
|
|
2008-07-29 18:54:06 +00:00
|
|
|
/*
|
|
|
|
* The i830 generation, in LVDS mode, defines P1 as the bit number set within
|
|
|
|
* this field (only one bit may be set).
|
|
|
|
*/
|
|
|
|
#define DPLL_FPA01_P1_POST_DIV_MASK_I830_LVDS 0x003f0000
|
|
|
|
#define DPLL_FPA01_P1_POST_DIV_SHIFT 16
|
2009-12-03 22:14:42 +00:00
|
|
|
#define DPLL_FPA01_P1_POST_DIV_SHIFT_PINEVIEW 15
|
2008-07-29 18:54:06 +00:00
|
|
|
/* i830, required in DVO non-gang */
|
|
|
|
#define PLL_P2_DIVIDE_BY_4 (1 << 23)
|
|
|
|
#define PLL_P1_DIVIDE_BY_TWO (1 << 21) /* i830 */
|
|
|
|
#define PLL_REF_INPUT_DREFCLK (0 << 13)
|
|
|
|
#define PLL_REF_INPUT_TVCLKINA (1 << 13) /* i830 */
|
|
|
|
#define PLL_REF_INPUT_TVCLKINBC (2 << 13) /* SDVO TVCLKIN */
|
|
|
|
#define PLLB_REF_INPUT_SPREADSPECTRUMIN (3 << 13)
|
|
|
|
#define PLL_REF_INPUT_MASK (3 << 13)
|
|
|
|
#define PLL_LOAD_PULSE_PHASE_SHIFT 9
|
2009-12-03 22:14:42 +00:00
|
|
|
/* Ironlake */
|
2009-06-05 07:38:38 +00:00
|
|
|
# define PLL_REF_SDVO_HDMI_MULTIPLIER_SHIFT 9
|
|
|
|
# define PLL_REF_SDVO_HDMI_MULTIPLIER_MASK (7 << 9)
|
|
|
|
# define PLL_REF_SDVO_HDMI_MULTIPLIER(x) (((x)-1) << 9)
|
|
|
|
# define DPLL_FPA1_P1_POST_DIV_SHIFT 0
|
|
|
|
# define DPLL_FPA1_P1_POST_DIV_MASK 0xff
|
|
|
|
|
2008-07-29 18:54:06 +00:00
|
|
|
/*
|
|
|
|
* Parallel to Serial Load Pulse phase selection.
|
|
|
|
* Selects the phase for the 10X DPLL clock for the PCIe
|
|
|
|
* digital display port. The range is 4 to 13; 10 or more
|
|
|
|
* is just a flip delay. The default is 6
|
|
|
|
*/
|
|
|
|
#define PLL_LOAD_PULSE_PHASE_MASK (0xf << PLL_LOAD_PULSE_PHASE_SHIFT)
|
|
|
|
#define DISPLAY_RATE_SELECT_FPA1 (1 << 8)
|
|
|
|
/*
|
|
|
|
* SDVO multiplier for 945G/GM. Not used on 965.
|
|
|
|
*/
|
|
|
|
#define SDVO_MULTIPLIER_MASK 0x000000ff
|
|
|
|
#define SDVO_MULTIPLIER_SHIFT_HIRES 4
|
|
|
|
#define SDVO_MULTIPLIER_SHIFT_VGA 0
|
drm/i915: Reorganize display pipe register accesses
RFCv2: Reorganize array indexing so that full offsets can be used as
is. It makes grepping for registers in i915_reg.h much easier. Also
move offset arrays to intel_device_info.
v1: Fixed offsets for VLV, proper eDP handling
v2: Fixed BCLRPAT, PIPESRC, PIPECONF and DSP* macros.
v3: Added EDP pipe comment, removed redundant offset arrays for
MSA_MISC and DDI_FUNC_CTL.
v4: Rename patch and report object size increase.
v5: Change location of commas, add PIPE_EDP into enum pipe
v6: Insert PIPE_EDP_OFFSET into pipe offset array
v7: Set I915_MAX_PIPES back to 3, change more registers accessors
to use the new macros, get rid of _PIPE_INC and add dev_priv
as a parameter where required by the new macros.
Upcoming hardware will not have the various display pipe register
ranges evenly spaced in memory. Change register address calculations
into array lookups.
Tested on SNB, VLV, IVB, Gen2 and HSW w/eDP.
I left the UMS cruft untouched.
Size differences:
text data bss dec hex filename
596431 4634 56 601121 92c21 i915.ko (new)
593199 4634 56 597889 91f81 i915.ko (old)
Signed-off-by: Antti Koskipaa <antti.koskipaa@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Tested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-02-04 12:22:24 +00:00
|
|
|
|
2014-04-09 10:29:08 +00:00
|
|
|
#define _DPLL_A_MD (dev_priv->info.display_mmio_offset + 0x601c)
|
|
|
|
#define _DPLL_B_MD (dev_priv->info.display_mmio_offset + 0x6020)
|
|
|
|
#define _CHV_DPLL_C_MD (dev_priv->info.display_mmio_offset + 0x603c)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define DPLL_MD(pipe) _MMIO_PIPE3((pipe), _DPLL_A_MD, _DPLL_B_MD, _CHV_DPLL_C_MD)
|
drm/i915: Reorganize display pipe register accesses
RFCv2: Reorganize array indexing so that full offsets can be used as
is. It makes grepping for registers in i915_reg.h much easier. Also
move offset arrays to intel_device_info.
v1: Fixed offsets for VLV, proper eDP handling
v2: Fixed BCLRPAT, PIPESRC, PIPECONF and DSP* macros.
v3: Added EDP pipe comment, removed redundant offset arrays for
MSA_MISC and DDI_FUNC_CTL.
v4: Rename patch and report object size increase.
v5: Change location of commas, add PIPE_EDP into enum pipe
v6: Insert PIPE_EDP_OFFSET into pipe offset array
v7: Set I915_MAX_PIPES back to 3, change more registers accessors
to use the new macros, get rid of _PIPE_INC and add dev_priv
as a parameter where required by the new macros.
Upcoming hardware will not have the various display pipe register
ranges evenly spaced in memory. Change register address calculations
into array lookups.
Tested on SNB, VLV, IVB, Gen2 and HSW w/eDP.
I left the UMS cruft untouched.
Size differences:
text data bss dec hex filename
596431 4634 56 601121 92c21 i915.ko (new)
593199 4634 56 597889 91f81 i915.ko (old)
Signed-off-by: Antti Koskipaa <antti.koskipaa@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Tested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-02-04 12:22:24 +00:00
|
|
|
|
2008-07-29 18:54:06 +00:00
|
|
|
/*
|
|
|
|
* UDI pixel divider, controlling how many pixels are stuffed into a packet.
|
|
|
|
*
|
|
|
|
* Value is pixels minus 1. Must be set to 1 pixel for SDVO.
|
|
|
|
*/
|
|
|
|
#define DPLL_MD_UDI_DIVIDER_MASK 0x3f000000
|
|
|
|
#define DPLL_MD_UDI_DIVIDER_SHIFT 24
|
|
|
|
/* UDI pixel divider for VGA, same as DPLL_MD_UDI_DIVIDER_MASK. */
|
|
|
|
#define DPLL_MD_VGA_UDI_DIVIDER_MASK 0x003f0000
|
|
|
|
#define DPLL_MD_VGA_UDI_DIVIDER_SHIFT 16
|
|
|
|
/*
|
|
|
|
* SDVO/UDI pixel multiplier.
|
|
|
|
*
|
|
|
|
* SDVO requires that the bus clock rate be between 1 and 2 Ghz, and the bus
|
|
|
|
* clock rate is 10 times the DPLL clock. At low resolution/refresh rate
|
|
|
|
* modes, the bus rate would be below the limits, so SDVO allows for stuffing
|
|
|
|
* dummy bytes in the datastream at an increased clock rate, with both sides of
|
|
|
|
* the link knowing how many bytes are fill.
|
|
|
|
*
|
|
|
|
* So, for a mode with a dotclock of 65Mhz, we would want to double the clock
|
|
|
|
* rate to 130Mhz to get a bus rate of 1.30Ghz. The DPLL clock rate would be
|
|
|
|
* set to 130Mhz, and the SDVO multiplier set to 2x in this register and
|
|
|
|
* through an SDVO command.
|
|
|
|
*
|
|
|
|
* This register field has values of multiplication factor minus 1, with
|
|
|
|
* a maximum multiplier of 5 for SDVO.
|
|
|
|
*/
|
|
|
|
#define DPLL_MD_UDI_MULTIPLIER_MASK 0x00003f00
|
|
|
|
#define DPLL_MD_UDI_MULTIPLIER_SHIFT 8
|
|
|
|
/*
|
|
|
|
* SDVO/UDI pixel multiplier for VGA, same as DPLL_MD_UDI_MULTIPLIER_MASK.
|
|
|
|
* This best be set to the default value (3) or the CRT won't work. No,
|
|
|
|
* I don't entirely understand what this does...
|
|
|
|
*/
|
|
|
|
#define DPLL_MD_VGA_UDI_MULTIPLIER_MASK 0x0000003f
|
|
|
|
#define DPLL_MD_VGA_UDI_MULTIPLIER_SHIFT 0
|
2012-03-28 20:39:23 +00:00
|
|
|
|
2016-04-27 14:43:22 +00:00
|
|
|
#define RAWCLK_FREQ_VLV _MMIO(VLV_DISPLAY_BASE + 0x6024)
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define _FPA0 0x6040
|
|
|
|
#define _FPA1 0x6044
|
|
|
|
#define _FPB0 0x6048
|
|
|
|
#define _FPB1 0x604c
|
|
|
|
#define FP0(pipe) _MMIO_PIPE(pipe, _FPA0, _FPB0)
|
|
|
|
#define FP1(pipe) _MMIO_PIPE(pipe, _FPA1, _FPB1)
|
2008-07-29 18:54:06 +00:00
|
|
|
#define FP_N_DIV_MASK 0x003f0000
|
2009-12-03 22:14:42 +00:00
|
|
|
#define FP_N_PINEVIEW_DIV_MASK 0x00ff0000
|
2008-07-29 18:54:06 +00:00
|
|
|
#define FP_N_DIV_SHIFT 16
|
|
|
|
#define FP_M1_DIV_MASK 0x00003f00
|
|
|
|
#define FP_M1_DIV_SHIFT 8
|
|
|
|
#define FP_M2_DIV_MASK 0x0000003f
|
2009-12-03 22:14:42 +00:00
|
|
|
#define FP_M2_PINEVIEW_DIV_MASK 0x000000ff
|
2008-07-29 18:54:06 +00:00
|
|
|
#define FP_M2_DIV_SHIFT 0
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define DPLL_TEST _MMIO(0x606c)
|
2008-07-29 18:54:06 +00:00
|
|
|
#define DPLLB_TEST_SDVO_DIV_1 (0 << 22)
|
|
|
|
#define DPLLB_TEST_SDVO_DIV_2 (1 << 22)
|
|
|
|
#define DPLLB_TEST_SDVO_DIV_4 (2 << 22)
|
|
|
|
#define DPLLB_TEST_SDVO_DIV_MASK (3 << 22)
|
|
|
|
#define DPLLB_TEST_N_BYPASS (1 << 19)
|
|
|
|
#define DPLLB_TEST_M_BYPASS (1 << 18)
|
|
|
|
#define DPLLB_INPUT_BUFFER_ENABLE (1 << 16)
|
|
|
|
#define DPLLA_TEST_N_BYPASS (1 << 3)
|
|
|
|
#define DPLLA_TEST_M_BYPASS (1 << 2)
|
|
|
|
#define DPLLA_INPUT_BUFFER_ENABLE (1 << 0)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define D_STATE _MMIO(0x6104)
|
2010-10-01 11:05:06 +00:00
|
|
|
#define DSTATE_GFX_RESET_I830 (1<<6)
|
2009-08-17 20:31:43 +00:00
|
|
|
#define DSTATE_PLL_D3_OFF (1<<3)
|
|
|
|
#define DSTATE_GFX_CLOCK_GATING (1<<1)
|
|
|
|
#define DSTATE_DOT_CLOCK_GATING (1<<0)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define DSPCLK_GATE_D _MMIO(dev_priv->info.display_mmio_offset + 0x6200)
|
2009-08-17 20:31:43 +00:00
|
|
|
# define DPUNIT_B_CLOCK_GATE_DISABLE (1 << 30) /* 965 */
|
|
|
|
# define VSUNIT_CLOCK_GATE_DISABLE (1 << 29) /* 965 */
|
|
|
|
# define VRHUNIT_CLOCK_GATE_DISABLE (1 << 28) /* 965 */
|
|
|
|
# define VRDUNIT_CLOCK_GATE_DISABLE (1 << 27) /* 965 */
|
|
|
|
# define AUDUNIT_CLOCK_GATE_DISABLE (1 << 26) /* 965 */
|
|
|
|
# define DPUNIT_A_CLOCK_GATE_DISABLE (1 << 25) /* 965 */
|
|
|
|
# define DPCUNIT_CLOCK_GATE_DISABLE (1 << 24) /* 965 */
|
|
|
|
# define TVRUNIT_CLOCK_GATE_DISABLE (1 << 23) /* 915-945 */
|
|
|
|
# define TVCUNIT_CLOCK_GATE_DISABLE (1 << 22) /* 915-945 */
|
|
|
|
# define TVFUNIT_CLOCK_GATE_DISABLE (1 << 21) /* 915-945 */
|
|
|
|
# define TVEUNIT_CLOCK_GATE_DISABLE (1 << 20) /* 915-945 */
|
|
|
|
# define DVSUNIT_CLOCK_GATE_DISABLE (1 << 19) /* 915-945 */
|
|
|
|
# define DSSUNIT_CLOCK_GATE_DISABLE (1 << 18) /* 915-945 */
|
|
|
|
# define DDBUNIT_CLOCK_GATE_DISABLE (1 << 17) /* 915-945 */
|
|
|
|
# define DPRUNIT_CLOCK_GATE_DISABLE (1 << 16) /* 915-945 */
|
|
|
|
# define DPFUNIT_CLOCK_GATE_DISABLE (1 << 15) /* 915-945 */
|
|
|
|
# define DPBMUNIT_CLOCK_GATE_DISABLE (1 << 14) /* 915-945 */
|
|
|
|
# define DPLSUNIT_CLOCK_GATE_DISABLE (1 << 13) /* 915-945 */
|
|
|
|
# define DPLUNIT_CLOCK_GATE_DISABLE (1 << 12) /* 915-945 */
|
|
|
|
# define DPOUNIT_CLOCK_GATE_DISABLE (1 << 11)
|
|
|
|
# define DPBUNIT_CLOCK_GATE_DISABLE (1 << 10)
|
|
|
|
# define DCUNIT_CLOCK_GATE_DISABLE (1 << 9)
|
|
|
|
# define DPUNIT_CLOCK_GATE_DISABLE (1 << 8)
|
|
|
|
# define VRUNIT_CLOCK_GATE_DISABLE (1 << 7) /* 915+: reserved */
|
|
|
|
# define OVHUNIT_CLOCK_GATE_DISABLE (1 << 6) /* 830-865 */
|
|
|
|
# define DPIOUNIT_CLOCK_GATE_DISABLE (1 << 6) /* 915-945 */
|
|
|
|
# define OVFUNIT_CLOCK_GATE_DISABLE (1 << 5)
|
|
|
|
# define OVBUNIT_CLOCK_GATE_DISABLE (1 << 4)
|
2014-04-25 17:14:30 +00:00
|
|
|
/*
|
2009-08-17 20:31:43 +00:00
|
|
|
* This bit must be set on the 830 to prevent hangs when turning off the
|
|
|
|
* overlay scaler.
|
|
|
|
*/
|
|
|
|
# define OVRUNIT_CLOCK_GATE_DISABLE (1 << 3)
|
|
|
|
# define OVCUNIT_CLOCK_GATE_DISABLE (1 << 2)
|
|
|
|
# define OVUUNIT_CLOCK_GATE_DISABLE (1 << 1)
|
|
|
|
# define ZVUNIT_CLOCK_GATE_DISABLE (1 << 0) /* 830 */
|
|
|
|
# define OVLUNIT_CLOCK_GATE_DISABLE (1 << 0) /* 845,865 */
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define RENCLK_GATE_D1 _MMIO(0x6204)
|
2009-08-17 20:31:43 +00:00
|
|
|
# define BLITTER_CLOCK_GATE_DISABLE (1 << 13) /* 945GM only */
|
|
|
|
# define MPEG_CLOCK_GATE_DISABLE (1 << 12) /* 945GM only */
|
|
|
|
# define PC_FE_CLOCK_GATE_DISABLE (1 << 11)
|
|
|
|
# define PC_BE_CLOCK_GATE_DISABLE (1 << 10)
|
|
|
|
# define WINDOWER_CLOCK_GATE_DISABLE (1 << 9)
|
|
|
|
# define INTERPOLATOR_CLOCK_GATE_DISABLE (1 << 8)
|
|
|
|
# define COLOR_CALCULATOR_CLOCK_GATE_DISABLE (1 << 7)
|
|
|
|
# define MOTION_COMP_CLOCK_GATE_DISABLE (1 << 6)
|
|
|
|
# define MAG_CLOCK_GATE_DISABLE (1 << 5)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* This bit must be unset on 855,865 */
|
2009-08-17 20:31:43 +00:00
|
|
|
# define MECI_CLOCK_GATE_DISABLE (1 << 4)
|
|
|
|
# define DCMP_CLOCK_GATE_DISABLE (1 << 3)
|
|
|
|
# define MEC_CLOCK_GATE_DISABLE (1 << 2)
|
|
|
|
# define MECO_CLOCK_GATE_DISABLE (1 << 1)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* This bit must be set on 855,865. */
|
2009-08-17 20:31:43 +00:00
|
|
|
# define SV_CLOCK_GATE_DISABLE (1 << 0)
|
|
|
|
# define I915_MPEG_CLOCK_GATE_DISABLE (1 << 16)
|
|
|
|
# define I915_VLD_IP_PR_CLOCK_GATE_DISABLE (1 << 15)
|
|
|
|
# define I915_MOTION_COMP_CLOCK_GATE_DISABLE (1 << 14)
|
|
|
|
# define I915_BD_BF_CLOCK_GATE_DISABLE (1 << 13)
|
|
|
|
# define I915_SF_SE_CLOCK_GATE_DISABLE (1 << 12)
|
|
|
|
# define I915_WM_CLOCK_GATE_DISABLE (1 << 11)
|
|
|
|
# define I915_IZ_CLOCK_GATE_DISABLE (1 << 10)
|
|
|
|
# define I915_PI_CLOCK_GATE_DISABLE (1 << 9)
|
|
|
|
# define I915_DI_CLOCK_GATE_DISABLE (1 << 8)
|
|
|
|
# define I915_SH_SV_CLOCK_GATE_DISABLE (1 << 7)
|
|
|
|
# define I915_PL_DG_QC_FT_CLOCK_GATE_DISABLE (1 << 6)
|
|
|
|
# define I915_SC_CLOCK_GATE_DISABLE (1 << 5)
|
|
|
|
# define I915_FL_CLOCK_GATE_DISABLE (1 << 4)
|
|
|
|
# define I915_DM_CLOCK_GATE_DISABLE (1 << 3)
|
|
|
|
# define I915_PS_CLOCK_GATE_DISABLE (1 << 2)
|
|
|
|
# define I915_CC_CLOCK_GATE_DISABLE (1 << 1)
|
|
|
|
# define I915_BY_CLOCK_GATE_DISABLE (1 << 0)
|
|
|
|
|
|
|
|
# define I965_RCZ_CLOCK_GATE_DISABLE (1 << 30)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* This bit must always be set on 965G/965GM */
|
2009-08-17 20:31:43 +00:00
|
|
|
# define I965_RCC_CLOCK_GATE_DISABLE (1 << 29)
|
|
|
|
# define I965_RCPB_CLOCK_GATE_DISABLE (1 << 28)
|
|
|
|
# define I965_DAP_CLOCK_GATE_DISABLE (1 << 27)
|
|
|
|
# define I965_ROC_CLOCK_GATE_DISABLE (1 << 26)
|
|
|
|
# define I965_GW_CLOCK_GATE_DISABLE (1 << 25)
|
|
|
|
# define I965_TD_CLOCK_GATE_DISABLE (1 << 24)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* This bit must always be set on 965G */
|
2009-08-17 20:31:43 +00:00
|
|
|
# define I965_ISC_CLOCK_GATE_DISABLE (1 << 23)
|
|
|
|
# define I965_IC_CLOCK_GATE_DISABLE (1 << 22)
|
|
|
|
# define I965_EU_CLOCK_GATE_DISABLE (1 << 21)
|
|
|
|
# define I965_IF_CLOCK_GATE_DISABLE (1 << 20)
|
|
|
|
# define I965_TC_CLOCK_GATE_DISABLE (1 << 19)
|
|
|
|
# define I965_SO_CLOCK_GATE_DISABLE (1 << 17)
|
|
|
|
# define I965_FBC_CLOCK_GATE_DISABLE (1 << 16)
|
|
|
|
# define I965_MARI_CLOCK_GATE_DISABLE (1 << 15)
|
|
|
|
# define I965_MASF_CLOCK_GATE_DISABLE (1 << 14)
|
|
|
|
# define I965_MAWB_CLOCK_GATE_DISABLE (1 << 13)
|
|
|
|
# define I965_EM_CLOCK_GATE_DISABLE (1 << 12)
|
|
|
|
# define I965_UC_CLOCK_GATE_DISABLE (1 << 11)
|
|
|
|
# define I965_SI_CLOCK_GATE_DISABLE (1 << 6)
|
|
|
|
# define I965_MT_CLOCK_GATE_DISABLE (1 << 5)
|
|
|
|
# define I965_PL_CLOCK_GATE_DISABLE (1 << 4)
|
|
|
|
# define I965_DG_CLOCK_GATE_DISABLE (1 << 3)
|
|
|
|
# define I965_QC_CLOCK_GATE_DISABLE (1 << 2)
|
|
|
|
# define I965_FT_CLOCK_GATE_DISABLE (1 << 1)
|
|
|
|
# define I965_DM_CLOCK_GATE_DISABLE (1 << 0)
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define RENCLK_GATE_D2 _MMIO(0x6208)
|
2009-08-17 20:31:43 +00:00
|
|
|
#define VF_UNIT_CLOCK_GATE_DISABLE (1 << 9)
|
|
|
|
#define GS_UNIT_CLOCK_GATE_DISABLE (1 << 7)
|
|
|
|
#define CL_UNIT_CLOCK_GATE_DISABLE (1 << 6)
|
2014-05-19 16:23:27 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define VDECCLK_GATE_D _MMIO(0x620C) /* g4x only */
|
2014-05-19 16:23:27 +00:00
|
|
|
#define VCP_UNIT_CLOCK_GATE_DISABLE (1 << 4)
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define RAMCLK_GATE_D _MMIO(0x6210) /* CRL only */
|
|
|
|
#define DEUC _MMIO(0x6214) /* CRL only */
|
2008-07-29 18:54:06 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define FW_BLC_SELF_VLV _MMIO(VLV_DISPLAY_BASE + 0x6500)
|
2012-03-28 20:39:22 +00:00
|
|
|
#define FW_CSPWRDWNEN (1<<15)
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define MI_ARB_VLV _MMIO(VLV_DISPLAY_BASE + 0x6504)
|
2013-06-12 19:11:18 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define CZCLK_CDCLK_FREQ_RATIO _MMIO(VLV_DISPLAY_BASE + 0x6508)
|
2013-09-27 07:31:00 +00:00
|
|
|
#define CDCLK_FREQ_SHIFT 4
|
|
|
|
#define CDCLK_FREQ_MASK (0x1f << CDCLK_FREQ_SHIFT)
|
|
|
|
#define CZCLK_FREQ_MASK 0xf
|
2015-03-05 19:19:50 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GCI_CONTROL _MMIO(VLV_DISPLAY_BASE + 0x650C)
|
2015-03-05 19:19:50 +00:00
|
|
|
#define PFI_CREDIT_63 (9 << 28) /* chv only */
|
|
|
|
#define PFI_CREDIT_31 (8 << 28) /* chv only */
|
|
|
|
#define PFI_CREDIT(x) (((x) - 8) << 28) /* 8-15 */
|
|
|
|
#define PFI_CREDIT_RESEND (1 << 27)
|
|
|
|
#define VGA_FAST_MODE_DISABLE (1 << 14)
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GMBUSFREQ_VLV _MMIO(VLV_DISPLAY_BASE + 0x6510)
|
2013-09-27 07:31:00 +00:00
|
|
|
|
2008-07-29 18:54:06 +00:00
|
|
|
/*
|
|
|
|
* Palette regs
|
|
|
|
*/
|
drm/i915: Reorganize display pipe register accesses
RFCv2: Reorganize array indexing so that full offsets can be used as
is. It makes grepping for registers in i915_reg.h much easier. Also
move offset arrays to intel_device_info.
v1: Fixed offsets for VLV, proper eDP handling
v2: Fixed BCLRPAT, PIPESRC, PIPECONF and DSP* macros.
v3: Added EDP pipe comment, removed redundant offset arrays for
MSA_MISC and DDI_FUNC_CTL.
v4: Rename patch and report object size increase.
v5: Change location of commas, add PIPE_EDP into enum pipe
v6: Insert PIPE_EDP_OFFSET into pipe offset array
v7: Set I915_MAX_PIPES back to 3, change more registers accessors
to use the new macros, get rid of _PIPE_INC and add dev_priv
as a parameter where required by the new macros.
Upcoming hardware will not have the various display pipe register
ranges evenly spaced in memory. Change register address calculations
into array lookups.
Tested on SNB, VLV, IVB, Gen2 and HSW w/eDP.
I left the UMS cruft untouched.
Size differences:
text data bss dec hex filename
596431 4634 56 601121 92c21 i915.ko (new)
593199 4634 56 597889 91f81 i915.ko (old)
Signed-off-by: Antti Koskipaa <antti.koskipaa@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Tested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-02-04 12:22:24 +00:00
|
|
|
#define PALETTE_A_OFFSET 0xa000
|
|
|
|
#define PALETTE_B_OFFSET 0xa800
|
2014-04-28 11:00:42 +00:00
|
|
|
#define CHV_PALETTE_C_OFFSET 0xc000
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define PALETTE(pipe, i) _MMIO(dev_priv->info.palette_offsets[pipe] + \
|
|
|
|
dev_priv->info.display_mmio_offset + (i) * 4)
|
2008-07-29 18:54:06 +00:00
|
|
|
|
2008-07-30 19:06:12 +00:00
|
|
|
/* MCH MMIO space */
|
|
|
|
|
|
|
|
/*
|
|
|
|
* MCHBAR mirror.
|
|
|
|
*
|
|
|
|
* This mirrors the MCHBAR MMIO space whose location is determined by
|
|
|
|
* device 0 function 0's pci config register 0x44 or 0x48 and matches it in
|
|
|
|
* every way. It is not accessible from the CP register read instructions.
|
|
|
|
*
|
2013-09-10 22:36:37 +00:00
|
|
|
* Starting from Haswell, you can't write registers using the MCHBAR mirror,
|
|
|
|
* just read.
|
2008-07-30 19:06:12 +00:00
|
|
|
*/
|
|
|
|
#define MCHBAR_MIRROR_BASE 0x10000
|
|
|
|
|
2010-12-15 07:42:31 +00:00
|
|
|
#define MCHBAR_MIRROR_BASE_SNB 0x140000
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define CTG_STOLEN_RESERVED _MMIO(MCHBAR_MIRROR_BASE + 0x34)
|
|
|
|
#define ELK_STOLEN_RESERVED _MMIO(MCHBAR_MIRROR_BASE + 0x48)
|
2015-09-16 18:28:50 +00:00
|
|
|
#define G4X_STOLEN_RESERVED_ADDR1_MASK (0xFFFF << 16)
|
|
|
|
#define G4X_STOLEN_RESERVED_ADDR2_MASK (0xFFF << 4)
|
|
|
|
|
2013-04-12 18:10:13 +00:00
|
|
|
/* Memory controller frequency in MCHBAR for Haswell (possible SNB+) */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define DCLK _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x5e04)
|
2013-04-12 18:10:13 +00:00
|
|
|
|
2014-04-25 17:14:30 +00:00
|
|
|
/* 915-945 and GM965 MCH register controlling DRAM channel access */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define DCC _MMIO(MCHBAR_MIRROR_BASE + 0x200)
|
2008-07-30 19:06:12 +00:00
|
|
|
#define DCC_ADDRESSING_MODE_SINGLE_CHANNEL (0 << 0)
|
|
|
|
#define DCC_ADDRESSING_MODE_DUAL_CHANNEL_ASYMMETRIC (1 << 0)
|
|
|
|
#define DCC_ADDRESSING_MODE_DUAL_CHANNEL_INTERLEAVED (2 << 0)
|
|
|
|
#define DCC_ADDRESSING_MODE_MASK (3 << 0)
|
|
|
|
#define DCC_CHANNEL_XOR_DISABLE (1 << 10)
|
2008-11-25 22:02:05 +00:00
|
|
|
#define DCC_CHANNEL_XOR_BIT_17 (1 << 9)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define DCC2 _MMIO(MCHBAR_MIRROR_BASE + 0x204)
|
2014-11-20 08:26:30 +00:00
|
|
|
#define DCC2_MODIFIED_ENHANCED_DISABLE (1 << 20)
|
2008-07-30 19:06:12 +00:00
|
|
|
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Pineview MCH register contains DDR3 setting */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define CSHRDDR3CTL _MMIO(MCHBAR_MIRROR_BASE + 0x1a8)
|
2010-05-18 10:58:44 +00:00
|
|
|
#define CSHRDDR3CTL_DDR3 (1 << 2)
|
|
|
|
|
2014-04-25 17:14:30 +00:00
|
|
|
/* 965 MCH register controlling DRAM channel configuration */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define C0DRB3 _MMIO(MCHBAR_MIRROR_BASE + 0x206)
|
|
|
|
#define C1DRB3 _MMIO(MCHBAR_MIRROR_BASE + 0x606)
|
2008-07-30 19:06:12 +00:00
|
|
|
|
2014-04-25 17:14:30 +00:00
|
|
|
/* snb MCH registers for reading the DRAM channel configuration */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define MAD_DIMM_C0 _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x5004)
|
|
|
|
#define MAD_DIMM_C1 _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x5008)
|
|
|
|
#define MAD_DIMM_C2 _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x500C)
|
2012-02-02 08:58:12 +00:00
|
|
|
#define MAD_DIMM_ECC_MASK (0x3 << 24)
|
|
|
|
#define MAD_DIMM_ECC_OFF (0x0 << 24)
|
|
|
|
#define MAD_DIMM_ECC_IO_ON_LOGIC_OFF (0x1 << 24)
|
|
|
|
#define MAD_DIMM_ECC_IO_OFF_LOGIC_ON (0x2 << 24)
|
|
|
|
#define MAD_DIMM_ECC_ON (0x3 << 24)
|
|
|
|
#define MAD_DIMM_ENH_INTERLEAVE (0x1 << 22)
|
|
|
|
#define MAD_DIMM_RANK_INTERLEAVE (0x1 << 21)
|
|
|
|
#define MAD_DIMM_B_WIDTH_X16 (0x1 << 20) /* X8 chips if unset */
|
|
|
|
#define MAD_DIMM_A_WIDTH_X16 (0x1 << 19) /* X8 chips if unset */
|
|
|
|
#define MAD_DIMM_B_DUAL_RANK (0x1 << 18)
|
|
|
|
#define MAD_DIMM_A_DUAL_RANK (0x1 << 17)
|
|
|
|
#define MAD_DIMM_A_SELECT (0x1 << 16)
|
|
|
|
/* DIMM sizes are in multiples of 256mb. */
|
|
|
|
#define MAD_DIMM_B_SIZE_SHIFT 8
|
|
|
|
#define MAD_DIMM_B_SIZE_MASK (0xff << MAD_DIMM_B_SIZE_SHIFT)
|
|
|
|
#define MAD_DIMM_A_SIZE_SHIFT 0
|
|
|
|
#define MAD_DIMM_A_SIZE_MASK (0xff << MAD_DIMM_A_SIZE_SHIFT)
|
|
|
|
|
2014-04-25 17:14:30 +00:00
|
|
|
/* snb MCH registers for priority tuning */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define MCH_SSKPD _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x5d10)
|
2013-02-09 20:03:42 +00:00
|
|
|
#define MCH_SSKPD_WM0_MASK 0x3f
|
|
|
|
#define MCH_SSKPD_WM0_VAL 0xc
|
2012-02-02 08:58:12 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define MCH_SECP_NRG_STTS _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x592c)
|
2013-08-20 09:29:23 +00:00
|
|
|
|
2009-06-12 05:28:56 +00:00
|
|
|
/* Clocking configuration register */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define CLKCFG _MMIO(MCHBAR_MIRROR_BASE + 0xc00)
|
2009-06-26 03:23:55 +00:00
|
|
|
#define CLKCFG_FSB_400 (5 << 0) /* hrawclk 100 */
|
2009-06-12 05:28:56 +00:00
|
|
|
#define CLKCFG_FSB_533 (1 << 0) /* hrawclk 133 */
|
|
|
|
#define CLKCFG_FSB_667 (3 << 0) /* hrawclk 166 */
|
|
|
|
#define CLKCFG_FSB_800 (2 << 0) /* hrawclk 200 */
|
|
|
|
#define CLKCFG_FSB_1067 (6 << 0) /* hrawclk 266 */
|
|
|
|
#define CLKCFG_FSB_1333 (7 << 0) /* hrawclk 333 */
|
2009-06-26 03:23:55 +00:00
|
|
|
/* Note, below two are guess */
|
2009-06-12 05:28:56 +00:00
|
|
|
#define CLKCFG_FSB_1600 (4 << 0) /* hrawclk 400 */
|
2009-06-26 03:23:55 +00:00
|
|
|
#define CLKCFG_FSB_1600_ALT (0 << 0) /* hrawclk 400 */
|
2009-06-12 05:28:56 +00:00
|
|
|
#define CLKCFG_FSB_MASK (7 << 0)
|
2009-06-26 03:23:55 +00:00
|
|
|
#define CLKCFG_MEM_533 (1 << 4)
|
|
|
|
#define CLKCFG_MEM_667 (2 << 4)
|
|
|
|
#define CLKCFG_MEM_800 (3 << 4)
|
|
|
|
#define CLKCFG_MEM_MASK (7 << 4)
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define HPLLVCO _MMIO(MCHBAR_MIRROR_BASE + 0xc38)
|
|
|
|
#define HPLLVCO_MOBILE _MMIO(MCHBAR_MIRROR_BASE + 0xc0f)
|
2015-05-22 08:22:33 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define TSC1 _MMIO(0x11001)
|
2010-09-10 17:02:13 +00:00
|
|
|
#define TSE (1<<0)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define TR1 _MMIO(0x11006)
|
|
|
|
#define TSFS _MMIO(0x11020)
|
2010-05-20 21:28:11 +00:00
|
|
|
#define TSFS_SLOPE_MASK 0x0000ff00
|
|
|
|
#define TSFS_SLOPE_SHIFT 8
|
|
|
|
#define TSFS_INTR_MASK 0x000000ff
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define CRSTANDVID _MMIO(0x11100)
|
|
|
|
#define PXVFREQ(fstart) _MMIO(0x11110 + (fstart) * 4) /* P[0-15]VIDFREQ (0x1114c) (Ironlake) */
|
2010-01-29 19:27:07 +00:00
|
|
|
#define PXVFREQ_PX_MASK 0x7f000000
|
|
|
|
#define PXVFREQ_PX_SHIFT 24
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define VIDFREQ_BASE _MMIO(0x11110)
|
|
|
|
#define VIDFREQ1 _MMIO(0x11110) /* VIDFREQ1-4 (0x1111c) (Cantiga) */
|
|
|
|
#define VIDFREQ2 _MMIO(0x11114)
|
|
|
|
#define VIDFREQ3 _MMIO(0x11118)
|
|
|
|
#define VIDFREQ4 _MMIO(0x1111c)
|
2010-01-29 19:27:07 +00:00
|
|
|
#define VIDFREQ_P0_MASK 0x1f000000
|
|
|
|
#define VIDFREQ_P0_SHIFT 24
|
|
|
|
#define VIDFREQ_P0_CSCLK_MASK 0x00f00000
|
|
|
|
#define VIDFREQ_P0_CSCLK_SHIFT 20
|
|
|
|
#define VIDFREQ_P0_CRCLK_MASK 0x000f0000
|
|
|
|
#define VIDFREQ_P0_CRCLK_SHIFT 16
|
|
|
|
#define VIDFREQ_P1_MASK 0x00001f00
|
|
|
|
#define VIDFREQ_P1_SHIFT 8
|
|
|
|
#define VIDFREQ_P1_CSCLK_MASK 0x000000f0
|
|
|
|
#define VIDFREQ_P1_CSCLK_SHIFT 4
|
|
|
|
#define VIDFREQ_P1_CRCLK_MASK 0x0000000f
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define INTTOEXT_BASE_ILK _MMIO(0x11300)
|
|
|
|
#define INTTOEXT_BASE _MMIO(0x11120) /* INTTOEXT1-8 (0x1113c) */
|
2010-01-29 19:27:07 +00:00
|
|
|
#define INTTOEXT_MAP3_SHIFT 24
|
|
|
|
#define INTTOEXT_MAP3_MASK (0x1f << INTTOEXT_MAP3_SHIFT)
|
|
|
|
#define INTTOEXT_MAP2_SHIFT 16
|
|
|
|
#define INTTOEXT_MAP2_MASK (0x1f << INTTOEXT_MAP2_SHIFT)
|
|
|
|
#define INTTOEXT_MAP1_SHIFT 8
|
|
|
|
#define INTTOEXT_MAP1_MASK (0x1f << INTTOEXT_MAP1_SHIFT)
|
|
|
|
#define INTTOEXT_MAP0_SHIFT 0
|
|
|
|
#define INTTOEXT_MAP0_MASK (0x1f << INTTOEXT_MAP0_SHIFT)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define MEMSWCTL _MMIO(0x11170) /* Ironlake only */
|
2010-01-29 19:27:07 +00:00
|
|
|
#define MEMCTL_CMD_MASK 0xe000
|
|
|
|
#define MEMCTL_CMD_SHIFT 13
|
|
|
|
#define MEMCTL_CMD_RCLK_OFF 0
|
|
|
|
#define MEMCTL_CMD_RCLK_ON 1
|
|
|
|
#define MEMCTL_CMD_CHFREQ 2
|
|
|
|
#define MEMCTL_CMD_CHVID 3
|
|
|
|
#define MEMCTL_CMD_VMMOFF 4
|
|
|
|
#define MEMCTL_CMD_VMMON 5
|
|
|
|
#define MEMCTL_CMD_STS (1<<12) /* write 1 triggers command, clears
|
|
|
|
when command complete */
|
|
|
|
#define MEMCTL_FREQ_MASK 0x0f00 /* jitter, from 0-15 */
|
|
|
|
#define MEMCTL_FREQ_SHIFT 8
|
|
|
|
#define MEMCTL_SFCAVM (1<<7)
|
|
|
|
#define MEMCTL_TGT_VID_MASK 0x007f
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define MEMIHYST _MMIO(0x1117c)
|
|
|
|
#define MEMINTREN _MMIO(0x11180) /* 16 bits */
|
2010-01-29 19:27:07 +00:00
|
|
|
#define MEMINT_RSEXIT_EN (1<<8)
|
|
|
|
#define MEMINT_CX_SUPR_EN (1<<7)
|
|
|
|
#define MEMINT_CONT_BUSY_EN (1<<6)
|
|
|
|
#define MEMINT_AVG_BUSY_EN (1<<5)
|
|
|
|
#define MEMINT_EVAL_CHG_EN (1<<4)
|
|
|
|
#define MEMINT_MON_IDLE_EN (1<<3)
|
|
|
|
#define MEMINT_UP_EVAL_EN (1<<2)
|
|
|
|
#define MEMINT_DOWN_EVAL_EN (1<<1)
|
|
|
|
#define MEMINT_SW_CMD_EN (1<<0)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define MEMINTRSTR _MMIO(0x11182) /* 16 bits */
|
2010-01-29 19:27:07 +00:00
|
|
|
#define MEM_RSEXIT_MASK 0xc000
|
|
|
|
#define MEM_RSEXIT_SHIFT 14
|
|
|
|
#define MEM_CONT_BUSY_MASK 0x3000
|
|
|
|
#define MEM_CONT_BUSY_SHIFT 12
|
|
|
|
#define MEM_AVG_BUSY_MASK 0x0c00
|
|
|
|
#define MEM_AVG_BUSY_SHIFT 10
|
|
|
|
#define MEM_EVAL_CHG_MASK 0x0300
|
|
|
|
#define MEM_EVAL_BUSY_SHIFT 8
|
|
|
|
#define MEM_MON_IDLE_MASK 0x00c0
|
|
|
|
#define MEM_MON_IDLE_SHIFT 6
|
|
|
|
#define MEM_UP_EVAL_MASK 0x0030
|
|
|
|
#define MEM_UP_EVAL_SHIFT 4
|
|
|
|
#define MEM_DOWN_EVAL_MASK 0x000c
|
|
|
|
#define MEM_DOWN_EVAL_SHIFT 2
|
|
|
|
#define MEM_SW_CMD_MASK 0x0003
|
|
|
|
#define MEM_INT_STEER_GFX 0
|
|
|
|
#define MEM_INT_STEER_CMR 1
|
|
|
|
#define MEM_INT_STEER_SMI 2
|
|
|
|
#define MEM_INT_STEER_SCI 3
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define MEMINTRSTS _MMIO(0x11184)
|
2010-01-29 19:27:07 +00:00
|
|
|
#define MEMINT_RSEXIT (1<<7)
|
|
|
|
#define MEMINT_CONT_BUSY (1<<6)
|
|
|
|
#define MEMINT_AVG_BUSY (1<<5)
|
|
|
|
#define MEMINT_EVAL_CHG (1<<4)
|
|
|
|
#define MEMINT_MON_IDLE (1<<3)
|
|
|
|
#define MEMINT_UP_EVAL (1<<2)
|
|
|
|
#define MEMINT_DOWN_EVAL (1<<1)
|
|
|
|
#define MEMINT_SW_CMD (1<<0)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define MEMMODECTL _MMIO(0x11190)
|
2010-01-29 19:27:07 +00:00
|
|
|
#define MEMMODE_BOOST_EN (1<<31)
|
|
|
|
#define MEMMODE_BOOST_FREQ_MASK 0x0f000000 /* jitter for boost, 0-15 */
|
|
|
|
#define MEMMODE_BOOST_FREQ_SHIFT 24
|
|
|
|
#define MEMMODE_IDLE_MODE_MASK 0x00030000
|
|
|
|
#define MEMMODE_IDLE_MODE_SHIFT 16
|
|
|
|
#define MEMMODE_IDLE_MODE_EVAL 0
|
|
|
|
#define MEMMODE_IDLE_MODE_CONT 1
|
|
|
|
#define MEMMODE_HWIDLE_EN (1<<15)
|
|
|
|
#define MEMMODE_SWMODE_EN (1<<14)
|
|
|
|
#define MEMMODE_RCLK_GATE (1<<13)
|
|
|
|
#define MEMMODE_HW_UPDATE (1<<12)
|
|
|
|
#define MEMMODE_FSTART_MASK 0x00000f00 /* starting jitter, 0-15 */
|
|
|
|
#define MEMMODE_FSTART_SHIFT 8
|
|
|
|
#define MEMMODE_FMAX_MASK 0x000000f0 /* max jitter, 0-15 */
|
|
|
|
#define MEMMODE_FMAX_SHIFT 4
|
|
|
|
#define MEMMODE_FMIN_MASK 0x0000000f /* min jitter, 0-15 */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define RCBMAXAVG _MMIO(0x1119c)
|
|
|
|
#define MEMSWCTL2 _MMIO(0x1119e) /* Cantiga only */
|
2010-01-29 19:27:07 +00:00
|
|
|
#define SWMEMCMD_RENDER_OFF (0 << 13)
|
|
|
|
#define SWMEMCMD_RENDER_ON (1 << 13)
|
|
|
|
#define SWMEMCMD_SWFREQ (2 << 13)
|
|
|
|
#define SWMEMCMD_TARVID (3 << 13)
|
|
|
|
#define SWMEMCMD_VRM_OFF (4 << 13)
|
|
|
|
#define SWMEMCMD_VRM_ON (5 << 13)
|
|
|
|
#define CMDSTS (1<<12)
|
|
|
|
#define SFCAVM (1<<11)
|
|
|
|
#define SWFREQ_MASK 0x0380 /* P0-7 */
|
|
|
|
#define SWFREQ_SHIFT 7
|
|
|
|
#define TARVID_MASK 0x001f
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define MEMSTAT_CTG _MMIO(0x111a0)
|
|
|
|
#define RCBMINAVG _MMIO(0x111a0)
|
|
|
|
#define RCUPEI _MMIO(0x111b0)
|
|
|
|
#define RCDNEI _MMIO(0x111b4)
|
|
|
|
#define RSTDBYCTL _MMIO(0x111b8)
|
2011-01-05 20:01:24 +00:00
|
|
|
#define RS1EN (1<<31)
|
|
|
|
#define RS2EN (1<<30)
|
|
|
|
#define RS3EN (1<<29)
|
|
|
|
#define D3RS3EN (1<<28) /* Display D3 imlies RS3 */
|
|
|
|
#define SWPROMORSX (1<<27) /* RSx promotion timers ignored */
|
|
|
|
#define RCWAKERW (1<<26) /* Resetwarn from PCH causes wakeup */
|
|
|
|
#define DPRSLPVREN (1<<25) /* Fast voltage ramp enable */
|
|
|
|
#define GFXTGHYST (1<<24) /* Hysteresis to allow trunk gating */
|
|
|
|
#define RCX_SW_EXIT (1<<23) /* Leave RSx and prevent re-entry */
|
|
|
|
#define RSX_STATUS_MASK (7<<20)
|
|
|
|
#define RSX_STATUS_ON (0<<20)
|
|
|
|
#define RSX_STATUS_RC1 (1<<20)
|
|
|
|
#define RSX_STATUS_RC1E (2<<20)
|
|
|
|
#define RSX_STATUS_RS1 (3<<20)
|
|
|
|
#define RSX_STATUS_RS2 (4<<20) /* aka rc6 */
|
|
|
|
#define RSX_STATUS_RSVD (5<<20) /* deep rc6 unsupported on ilk */
|
|
|
|
#define RSX_STATUS_RS3 (6<<20) /* rs3 unsupported on ilk */
|
|
|
|
#define RSX_STATUS_RSVD2 (7<<20)
|
|
|
|
#define UWRCRSXE (1<<19) /* wake counter limit prevents rsx */
|
|
|
|
#define RSCRP (1<<18) /* rs requests control on rs1/2 reqs */
|
|
|
|
#define JRSC (1<<17) /* rsx coupled to cpu c-state */
|
|
|
|
#define RS2INC0 (1<<16) /* allow rs2 in cpu c0 */
|
|
|
|
#define RS1CONTSAV_MASK (3<<14)
|
|
|
|
#define RS1CONTSAV_NO_RS1 (0<<14) /* rs1 doesn't save/restore context */
|
|
|
|
#define RS1CONTSAV_RSVD (1<<14)
|
|
|
|
#define RS1CONTSAV_SAVE_RS1 (2<<14) /* rs1 saves context */
|
|
|
|
#define RS1CONTSAV_FULL_RS1 (3<<14) /* rs1 saves and restores context */
|
|
|
|
#define NORMSLEXLAT_MASK (3<<12)
|
|
|
|
#define SLOW_RS123 (0<<12)
|
|
|
|
#define SLOW_RS23 (1<<12)
|
|
|
|
#define SLOW_RS3 (2<<12)
|
|
|
|
#define NORMAL_RS123 (3<<12)
|
|
|
|
#define RCMODE_TIMEOUT (1<<11) /* 0 is eval interval method */
|
|
|
|
#define IMPROMOEN (1<<10) /* promo is immediate or delayed until next idle interval (only for timeout method above) */
|
|
|
|
#define RCENTSYNC (1<<9) /* rs coupled to cpu c-state (3/6/7) */
|
|
|
|
#define STATELOCK (1<<7) /* locked to rs_cstate if 0 */
|
|
|
|
#define RS_CSTATE_MASK (3<<4)
|
|
|
|
#define RS_CSTATE_C367_RS1 (0<<4)
|
|
|
|
#define RS_CSTATE_C36_RS1_C7_RS2 (1<<4)
|
|
|
|
#define RS_CSTATE_RSVD (2<<4)
|
|
|
|
#define RS_CSTATE_C367_RS2 (3<<4)
|
|
|
|
#define REDSAVES (1<<3) /* no context save if was idle during rs0 */
|
|
|
|
#define REDRESTORES (1<<2) /* no restore if was idle during rs0 */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define VIDCTL _MMIO(0x111c0)
|
|
|
|
#define VIDSTS _MMIO(0x111c8)
|
|
|
|
#define VIDSTART _MMIO(0x111cc) /* 8 bits */
|
|
|
|
#define MEMSTAT_ILK _MMIO(0x111f8)
|
2010-01-29 19:27:07 +00:00
|
|
|
#define MEMSTAT_VID_MASK 0x7f00
|
|
|
|
#define MEMSTAT_VID_SHIFT 8
|
|
|
|
#define MEMSTAT_PSTATE_MASK 0x00f8
|
|
|
|
#define MEMSTAT_PSTATE_SHIFT 3
|
|
|
|
#define MEMSTAT_MON_ACTV (1<<2)
|
|
|
|
#define MEMSTAT_SRC_CTL_MASK 0x0003
|
|
|
|
#define MEMSTAT_SRC_CTL_CORE 0
|
|
|
|
#define MEMSTAT_SRC_CTL_TRB 1
|
|
|
|
#define MEMSTAT_SRC_CTL_THM 2
|
|
|
|
#define MEMSTAT_SRC_CTL_STDBY 3
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define RCPREVBSYTUPAVG _MMIO(0x113b8)
|
|
|
|
#define RCPREVBSYTDNAVG _MMIO(0x113bc)
|
|
|
|
#define PMMISC _MMIO(0x11214)
|
2010-09-10 17:02:13 +00:00
|
|
|
#define MCPPCE_EN (1<<0) /* enable PM_MSG from PCH->MPC */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define SDEW _MMIO(0x1124c)
|
|
|
|
#define CSIEW0 _MMIO(0x11250)
|
|
|
|
#define CSIEW1 _MMIO(0x11254)
|
|
|
|
#define CSIEW2 _MMIO(0x11258)
|
|
|
|
#define PEW(i) _MMIO(0x1125c + (i) * 4) /* 5 registers */
|
|
|
|
#define DEW(i) _MMIO(0x11270 + (i) * 4) /* 3 registers */
|
|
|
|
#define MCHAFE _MMIO(0x112c0)
|
|
|
|
#define CSIEC _MMIO(0x112e0)
|
|
|
|
#define DMIEC _MMIO(0x112e4)
|
|
|
|
#define DDREC _MMIO(0x112e8)
|
|
|
|
#define PEG0EC _MMIO(0x112ec)
|
|
|
|
#define PEG1EC _MMIO(0x112f0)
|
|
|
|
#define GFXEC _MMIO(0x112f4)
|
|
|
|
#define RPPREVBSYTUPAVG _MMIO(0x113b8)
|
|
|
|
#define RPPREVBSYTDNAVG _MMIO(0x113bc)
|
|
|
|
#define ECR _MMIO(0x11600)
|
2010-05-20 21:28:11 +00:00
|
|
|
#define ECR_GPFE (1<<31)
|
|
|
|
#define ECR_IMONE (1<<30)
|
|
|
|
#define ECR_CAP_MASK 0x0000001f /* Event range, 0-31 */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define OGW0 _MMIO(0x11608)
|
|
|
|
#define OGW1 _MMIO(0x1160c)
|
|
|
|
#define EG0 _MMIO(0x11610)
|
|
|
|
#define EG1 _MMIO(0x11614)
|
|
|
|
#define EG2 _MMIO(0x11618)
|
|
|
|
#define EG3 _MMIO(0x1161c)
|
|
|
|
#define EG4 _MMIO(0x11620)
|
|
|
|
#define EG5 _MMIO(0x11624)
|
|
|
|
#define EG6 _MMIO(0x11628)
|
|
|
|
#define EG7 _MMIO(0x1162c)
|
|
|
|
#define PXW(i) _MMIO(0x11664 + (i) * 4) /* 4 registers */
|
|
|
|
#define PXWL(i) _MMIO(0x11680 + (i) * 8) /* 8 registers */
|
|
|
|
#define LCFUSE02 _MMIO(0x116c0)
|
2010-05-20 21:28:11 +00:00
|
|
|
#define LCFUSE_HIV_MASK 0x000000ff
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define CSIPLL0 _MMIO(0x12c10)
|
|
|
|
#define DDRMPLL1 _MMIO(0X12c20)
|
|
|
|
#define PEG_BAND_GAP_DATA _MMIO(0x14d68)
|
2009-01-02 21:33:00 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN6_GT_THREAD_STATUS_REG _MMIO(0x13805c)
|
2012-07-02 14:51:03 +00:00
|
|
|
#define GEN6_GT_THREAD_STATUS_CORE_MASK 0x7
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN6_GT_PERF_STATUS _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x5948)
|
|
|
|
#define BXT_GT_PERF_STATUS _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x7070)
|
|
|
|
#define GEN6_RP_STATE_LIMITS _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x5994)
|
|
|
|
#define GEN6_RP_STATE_CAP _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x5998)
|
|
|
|
#define BXT_RP_STATE_CAP _MMIO(0x138170)
|
2010-12-17 22:19:02 +00:00
|
|
|
|
2016-04-20 13:43:56 +00:00
|
|
|
/*
|
|
|
|
* Make these a multiple of magic 25 to avoid SNB (eg. Dell XPS
|
|
|
|
* 8300) freezing up around GPU hangs. Looks as if even
|
|
|
|
* scheduling/timer interrupts start misbehaving if the RPS
|
|
|
|
* EI/thresholds are "bad", leading to a very sluggish or even
|
|
|
|
* frozen machine.
|
|
|
|
*/
|
|
|
|
#define INTERVAL_1_28_US(us) roundup(((us) * 100) >> 7, 25)
|
2015-03-06 05:37:14 +00:00
|
|
|
#define INTERVAL_1_33_US(us) (((us) * 3) >> 2)
|
2015-09-18 18:09:51 +00:00
|
|
|
#define INTERVAL_0_833_US(us) (((us) * 6) / 5)
|
2015-03-06 05:37:14 +00:00
|
|
|
#define GT_INTERVAL_FROM_US(dev_priv, us) (IS_GEN9(dev_priv) ? \
|
2015-09-18 18:09:51 +00:00
|
|
|
(IS_BROXTON(dev_priv) ? \
|
|
|
|
INTERVAL_0_833_US(us) : \
|
|
|
|
INTERVAL_1_33_US(us)) : \
|
2015-03-06 05:37:14 +00:00
|
|
|
INTERVAL_1_28_US(us))
|
|
|
|
|
2016-04-22 18:35:44 +00:00
|
|
|
#define INTERVAL_1_28_TO_US(interval) (((interval) << 7) / 100)
|
|
|
|
#define INTERVAL_1_33_TO_US(interval) (((interval) << 2) / 3)
|
|
|
|
#define INTERVAL_0_833_TO_US(interval) (((interval) * 5) / 6)
|
|
|
|
#define GT_PM_INTERVAL_TO_US(dev_priv, interval) (IS_GEN9(dev_priv) ? \
|
|
|
|
(IS_BROXTON(dev_priv) ? \
|
|
|
|
INTERVAL_0_833_TO_US(interval) : \
|
|
|
|
INTERVAL_1_33_TO_US(interval)) : \
|
|
|
|
INTERVAL_1_28_TO_US(interval))
|
|
|
|
|
2010-06-25 05:40:23 +00:00
|
|
|
/*
|
|
|
|
* Logical Context regs
|
|
|
|
*/
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define CCID _MMIO(0x2180)
|
2010-06-25 05:40:23 +00:00
|
|
|
#define CCID_EN (1<<0)
|
2013-08-22 16:23:13 +00:00
|
|
|
/*
|
|
|
|
* Notes on SNB/IVB/VLV context size:
|
|
|
|
* - Power context is saved elsewhere (LLC or stolen)
|
|
|
|
* - Ring/execlist context is saved on SNB, not on IVB
|
|
|
|
* - Extended context size already includes render context size
|
|
|
|
* - We always need to follow the extended context size.
|
|
|
|
* SNB BSpec has comments indicating that we should use the
|
|
|
|
* render context size instead if execlists are disabled, but
|
|
|
|
* based on empirical testing that's just nonsense.
|
|
|
|
* - Pipelined/VF state is saved on SNB/IVB respectively
|
|
|
|
* - GT1 size just indicates how much of render context
|
|
|
|
* doesn't need saving on GT1
|
|
|
|
*/
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define CXT_SIZE _MMIO(0x21a0)
|
2015-09-18 17:03:39 +00:00
|
|
|
#define GEN6_CXT_POWER_SIZE(cxt_reg) (((cxt_reg) >> 24) & 0x3f)
|
|
|
|
#define GEN6_CXT_RING_SIZE(cxt_reg) (((cxt_reg) >> 18) & 0x3f)
|
|
|
|
#define GEN6_CXT_RENDER_SIZE(cxt_reg) (((cxt_reg) >> 12) & 0x3f)
|
|
|
|
#define GEN6_CXT_EXTENDED_SIZE(cxt_reg) (((cxt_reg) >> 6) & 0x3f)
|
|
|
|
#define GEN6_CXT_PIPELINE_SIZE(cxt_reg) (((cxt_reg) >> 0) & 0x3f)
|
2013-08-22 16:23:13 +00:00
|
|
|
#define GEN6_CXT_TOTAL_SIZE(cxt_reg) (GEN6_CXT_RING_SIZE(cxt_reg) + \
|
2012-06-04 21:42:41 +00:00
|
|
|
GEN6_CXT_EXTENDED_SIZE(cxt_reg) + \
|
|
|
|
GEN6_CXT_PIPELINE_SIZE(cxt_reg))
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN7_CXT_SIZE _MMIO(0x21a8)
|
2015-09-18 17:03:39 +00:00
|
|
|
#define GEN7_CXT_POWER_SIZE(ctx_reg) (((ctx_reg) >> 25) & 0x7f)
|
|
|
|
#define GEN7_CXT_RING_SIZE(ctx_reg) (((ctx_reg) >> 22) & 0x7)
|
|
|
|
#define GEN7_CXT_RENDER_SIZE(ctx_reg) (((ctx_reg) >> 16) & 0x3f)
|
|
|
|
#define GEN7_CXT_EXTENDED_SIZE(ctx_reg) (((ctx_reg) >> 9) & 0x7f)
|
|
|
|
#define GEN7_CXT_GT1_SIZE(ctx_reg) (((ctx_reg) >> 6) & 0x7)
|
|
|
|
#define GEN7_CXT_VFSTATE_SIZE(ctx_reg) (((ctx_reg) >> 0) & 0x3f)
|
2013-08-22 16:23:13 +00:00
|
|
|
#define GEN7_CXT_TOTAL_SIZE(ctx_reg) (GEN7_CXT_EXTENDED_SIZE(ctx_reg) + \
|
2012-07-18 17:10:09 +00:00
|
|
|
GEN7_CXT_VFSTATE_SIZE(ctx_reg))
|
2013-06-26 04:53:40 +00:00
|
|
|
/* Haswell does have the CXT_SIZE register however it does not appear to be
|
|
|
|
* valid. Now, docs explain in dwords what is in the context object. The full
|
|
|
|
* size is 70720 bytes, however, the power context and execlist context will
|
|
|
|
* never be saved (power context is stored elsewhere, and execlists don't work
|
2015-06-16 10:39:41 +00:00
|
|
|
* on HSW) - so the final size, including the extra state required for the
|
|
|
|
* Resource Streamer, is 66944 bytes, which rounds to 17 pages.
|
2013-06-26 04:53:40 +00:00
|
|
|
*/
|
|
|
|
#define HSW_CXT_TOTAL_SIZE (17 * PAGE_SIZE)
|
2013-11-03 04:07:05 +00:00
|
|
|
/* Same as Haswell, but 72064 bytes now. */
|
|
|
|
#define GEN8_CXT_TOTAL_SIZE (18 * PAGE_SIZE)
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define CHV_CLK_CTL1 _MMIO(0x101100)
|
|
|
|
#define VLV_CLK_CTL2 _MMIO(0x101104)
|
2013-09-27 00:55:58 +00:00
|
|
|
#define CLK_CTL2_CZCOUNT_30NS_SHIFT 28
|
|
|
|
|
2008-07-29 18:54:06 +00:00
|
|
|
/*
|
|
|
|
* Overlay regs
|
|
|
|
*/
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define OVADD _MMIO(0x30000)
|
|
|
|
#define DOVSTA _MMIO(0x30008)
|
2008-07-29 18:54:06 +00:00
|
|
|
#define OC_BUF (0x3<<20)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define OGAMC5 _MMIO(0x30010)
|
|
|
|
#define OGAMC4 _MMIO(0x30014)
|
|
|
|
#define OGAMC3 _MMIO(0x30018)
|
|
|
|
#define OGAMC2 _MMIO(0x3001c)
|
|
|
|
#define OGAMC1 _MMIO(0x30020)
|
|
|
|
#define OGAMC0 _MMIO(0x30024)
|
2008-07-29 18:54:06 +00:00
|
|
|
|
2015-12-01 08:23:52 +00:00
|
|
|
/*
|
|
|
|
* GEN9 clock gating regs
|
|
|
|
*/
|
|
|
|
#define GEN9_CLKGATE_DIS_0 _MMIO(0x46530)
|
|
|
|
#define PWM2_GATING_DIS (1 << 14)
|
|
|
|
#define PWM1_GATING_DIS (1 << 13)
|
|
|
|
|
2008-07-29 18:54:06 +00:00
|
|
|
/*
|
|
|
|
* Display engine regs
|
|
|
|
*/
|
|
|
|
|
2013-10-15 17:55:27 +00:00
|
|
|
/* Pipe A CRC regs */
|
drm/i915: Reorganize display pipe register accesses
RFCv2: Reorganize array indexing so that full offsets can be used as
is. It makes grepping for registers in i915_reg.h much easier. Also
move offset arrays to intel_device_info.
v1: Fixed offsets for VLV, proper eDP handling
v2: Fixed BCLRPAT, PIPESRC, PIPECONF and DSP* macros.
v3: Added EDP pipe comment, removed redundant offset arrays for
MSA_MISC and DDI_FUNC_CTL.
v4: Rename patch and report object size increase.
v5: Change location of commas, add PIPE_EDP into enum pipe
v6: Insert PIPE_EDP_OFFSET into pipe offset array
v7: Set I915_MAX_PIPES back to 3, change more registers accessors
to use the new macros, get rid of _PIPE_INC and add dev_priv
as a parameter where required by the new macros.
Upcoming hardware will not have the various display pipe register
ranges evenly spaced in memory. Change register address calculations
into array lookups.
Tested on SNB, VLV, IVB, Gen2 and HSW w/eDP.
I left the UMS cruft untouched.
Size differences:
text data bss dec hex filename
596431 4634 56 601121 92c21 i915.ko (new)
593199 4634 56 597889 91f81 i915.ko (old)
Signed-off-by: Antti Koskipaa <antti.koskipaa@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Tested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-02-04 12:22:24 +00:00
|
|
|
#define _PIPE_CRC_CTL_A 0x60050
|
2013-10-15 17:55:27 +00:00
|
|
|
#define PIPE_CRC_ENABLE (1 << 31)
|
2013-10-16 20:55:54 +00:00
|
|
|
/* ivb+ source selection */
|
2013-10-15 17:55:27 +00:00
|
|
|
#define PIPE_CRC_SOURCE_PRIMARY_IVB (0 << 29)
|
|
|
|
#define PIPE_CRC_SOURCE_SPRITE_IVB (1 << 29)
|
|
|
|
#define PIPE_CRC_SOURCE_PF_IVB (2 << 29)
|
2013-10-16 20:55:54 +00:00
|
|
|
/* ilk+ source selection */
|
2013-10-16 20:55:47 +00:00
|
|
|
#define PIPE_CRC_SOURCE_PRIMARY_ILK (0 << 28)
|
|
|
|
#define PIPE_CRC_SOURCE_SPRITE_ILK (1 << 28)
|
|
|
|
#define PIPE_CRC_SOURCE_PIPE_ILK (2 << 28)
|
|
|
|
/* embedded DP port on the north display block, reserved on ivb */
|
|
|
|
#define PIPE_CRC_SOURCE_PORT_A_ILK (4 << 28)
|
|
|
|
#define PIPE_CRC_SOURCE_FDI_ILK (5 << 28) /* reserved on ivb */
|
2013-10-16 20:55:54 +00:00
|
|
|
/* vlv source selection */
|
|
|
|
#define PIPE_CRC_SOURCE_PIPE_VLV (0 << 27)
|
|
|
|
#define PIPE_CRC_SOURCE_HDMIB_VLV (1 << 27)
|
|
|
|
#define PIPE_CRC_SOURCE_HDMIC_VLV (2 << 27)
|
|
|
|
/* with DP port the pipe source is invalid */
|
|
|
|
#define PIPE_CRC_SOURCE_DP_D_VLV (3 << 27)
|
|
|
|
#define PIPE_CRC_SOURCE_DP_B_VLV (6 << 27)
|
|
|
|
#define PIPE_CRC_SOURCE_DP_C_VLV (7 << 27)
|
|
|
|
/* gen3+ source selection */
|
|
|
|
#define PIPE_CRC_SOURCE_PIPE_I9XX (0 << 28)
|
|
|
|
#define PIPE_CRC_SOURCE_SDVOB_I9XX (1 << 28)
|
|
|
|
#define PIPE_CRC_SOURCE_SDVOC_I9XX (2 << 28)
|
|
|
|
/* with DP/TV port the pipe source is invalid */
|
|
|
|
#define PIPE_CRC_SOURCE_DP_D_G4X (3 << 28)
|
|
|
|
#define PIPE_CRC_SOURCE_TV_PRE (4 << 28)
|
|
|
|
#define PIPE_CRC_SOURCE_TV_POST (5 << 28)
|
|
|
|
#define PIPE_CRC_SOURCE_DP_B_G4X (6 << 28)
|
|
|
|
#define PIPE_CRC_SOURCE_DP_C_G4X (7 << 28)
|
|
|
|
/* gen2 doesn't have source selection bits */
|
2013-10-21 15:26:38 +00:00
|
|
|
#define PIPE_CRC_INCLUDE_BORDER_I8XX (1 << 30)
|
2013-10-16 20:55:54 +00:00
|
|
|
|
2013-10-16 20:55:47 +00:00
|
|
|
#define _PIPE_CRC_RES_1_A_IVB 0x60064
|
|
|
|
#define _PIPE_CRC_RES_2_A_IVB 0x60068
|
|
|
|
#define _PIPE_CRC_RES_3_A_IVB 0x6006c
|
|
|
|
#define _PIPE_CRC_RES_4_A_IVB 0x60070
|
|
|
|
#define _PIPE_CRC_RES_5_A_IVB 0x60074
|
|
|
|
|
drm/i915: Reorganize display pipe register accesses
RFCv2: Reorganize array indexing so that full offsets can be used as
is. It makes grepping for registers in i915_reg.h much easier. Also
move offset arrays to intel_device_info.
v1: Fixed offsets for VLV, proper eDP handling
v2: Fixed BCLRPAT, PIPESRC, PIPECONF and DSP* macros.
v3: Added EDP pipe comment, removed redundant offset arrays for
MSA_MISC and DDI_FUNC_CTL.
v4: Rename patch and report object size increase.
v5: Change location of commas, add PIPE_EDP into enum pipe
v6: Insert PIPE_EDP_OFFSET into pipe offset array
v7: Set I915_MAX_PIPES back to 3, change more registers accessors
to use the new macros, get rid of _PIPE_INC and add dev_priv
as a parameter where required by the new macros.
Upcoming hardware will not have the various display pipe register
ranges evenly spaced in memory. Change register address calculations
into array lookups.
Tested on SNB, VLV, IVB, Gen2 and HSW w/eDP.
I left the UMS cruft untouched.
Size differences:
text data bss dec hex filename
596431 4634 56 601121 92c21 i915.ko (new)
593199 4634 56 597889 91f81 i915.ko (old)
Signed-off-by: Antti Koskipaa <antti.koskipaa@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Tested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-02-04 12:22:24 +00:00
|
|
|
#define _PIPE_CRC_RES_RED_A 0x60060
|
|
|
|
#define _PIPE_CRC_RES_GREEN_A 0x60064
|
|
|
|
#define _PIPE_CRC_RES_BLUE_A 0x60068
|
|
|
|
#define _PIPE_CRC_RES_RES1_A_I915 0x6006c
|
|
|
|
#define _PIPE_CRC_RES_RES2_A_G4X 0x60080
|
2013-10-15 17:55:27 +00:00
|
|
|
|
|
|
|
/* Pipe B CRC regs */
|
2013-10-16 20:55:47 +00:00
|
|
|
#define _PIPE_CRC_RES_1_B_IVB 0x61064
|
|
|
|
#define _PIPE_CRC_RES_2_B_IVB 0x61068
|
|
|
|
#define _PIPE_CRC_RES_3_B_IVB 0x6106c
|
|
|
|
#define _PIPE_CRC_RES_4_B_IVB 0x61070
|
|
|
|
#define _PIPE_CRC_RES_5_B_IVB 0x61074
|
2013-10-15 17:55:27 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define PIPE_CRC_CTL(pipe) _MMIO_TRANS2(pipe, _PIPE_CRC_CTL_A)
|
|
|
|
#define PIPE_CRC_RES_1_IVB(pipe) _MMIO_TRANS2(pipe, _PIPE_CRC_RES_1_A_IVB)
|
|
|
|
#define PIPE_CRC_RES_2_IVB(pipe) _MMIO_TRANS2(pipe, _PIPE_CRC_RES_2_A_IVB)
|
|
|
|
#define PIPE_CRC_RES_3_IVB(pipe) _MMIO_TRANS2(pipe, _PIPE_CRC_RES_3_A_IVB)
|
|
|
|
#define PIPE_CRC_RES_4_IVB(pipe) _MMIO_TRANS2(pipe, _PIPE_CRC_RES_4_A_IVB)
|
|
|
|
#define PIPE_CRC_RES_5_IVB(pipe) _MMIO_TRANS2(pipe, _PIPE_CRC_RES_5_A_IVB)
|
|
|
|
|
|
|
|
#define PIPE_CRC_RES_RED(pipe) _MMIO_TRANS2(pipe, _PIPE_CRC_RES_RED_A)
|
|
|
|
#define PIPE_CRC_RES_GREEN(pipe) _MMIO_TRANS2(pipe, _PIPE_CRC_RES_GREEN_A)
|
|
|
|
#define PIPE_CRC_RES_BLUE(pipe) _MMIO_TRANS2(pipe, _PIPE_CRC_RES_BLUE_A)
|
|
|
|
#define PIPE_CRC_RES_RES1_I915(pipe) _MMIO_TRANS2(pipe, _PIPE_CRC_RES_RES1_A_I915)
|
|
|
|
#define PIPE_CRC_RES_RES2_G4X(pipe) _MMIO_TRANS2(pipe, _PIPE_CRC_RES_RES2_A_G4X)
|
2013-10-16 20:55:47 +00:00
|
|
|
|
2008-07-29 18:54:06 +00:00
|
|
|
/* Pipe A timing regs */
|
drm/i915: Reorganize display pipe register accesses
RFCv2: Reorganize array indexing so that full offsets can be used as
is. It makes grepping for registers in i915_reg.h much easier. Also
move offset arrays to intel_device_info.
v1: Fixed offsets for VLV, proper eDP handling
v2: Fixed BCLRPAT, PIPESRC, PIPECONF and DSP* macros.
v3: Added EDP pipe comment, removed redundant offset arrays for
MSA_MISC and DDI_FUNC_CTL.
v4: Rename patch and report object size increase.
v5: Change location of commas, add PIPE_EDP into enum pipe
v6: Insert PIPE_EDP_OFFSET into pipe offset array
v7: Set I915_MAX_PIPES back to 3, change more registers accessors
to use the new macros, get rid of _PIPE_INC and add dev_priv
as a parameter where required by the new macros.
Upcoming hardware will not have the various display pipe register
ranges evenly spaced in memory. Change register address calculations
into array lookups.
Tested on SNB, VLV, IVB, Gen2 and HSW w/eDP.
I left the UMS cruft untouched.
Size differences:
text data bss dec hex filename
596431 4634 56 601121 92c21 i915.ko (new)
593199 4634 56 597889 91f81 i915.ko (old)
Signed-off-by: Antti Koskipaa <antti.koskipaa@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Tested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-02-04 12:22:24 +00:00
|
|
|
#define _HTOTAL_A 0x60000
|
|
|
|
#define _HBLANK_A 0x60004
|
|
|
|
#define _HSYNC_A 0x60008
|
|
|
|
#define _VTOTAL_A 0x6000c
|
|
|
|
#define _VBLANK_A 0x60010
|
|
|
|
#define _VSYNC_A 0x60014
|
|
|
|
#define _PIPEASRC 0x6001c
|
|
|
|
#define _BCLRPAT_A 0x60020
|
|
|
|
#define _VSYNCSHIFT_A 0x60028
|
2014-09-30 17:30:22 +00:00
|
|
|
#define _PIPE_MULT_A 0x6002c
|
2008-07-29 18:54:06 +00:00
|
|
|
|
|
|
|
/* Pipe B timing regs */
|
drm/i915: Reorganize display pipe register accesses
RFCv2: Reorganize array indexing so that full offsets can be used as
is. It makes grepping for registers in i915_reg.h much easier. Also
move offset arrays to intel_device_info.
v1: Fixed offsets for VLV, proper eDP handling
v2: Fixed BCLRPAT, PIPESRC, PIPECONF and DSP* macros.
v3: Added EDP pipe comment, removed redundant offset arrays for
MSA_MISC and DDI_FUNC_CTL.
v4: Rename patch and report object size increase.
v5: Change location of commas, add PIPE_EDP into enum pipe
v6: Insert PIPE_EDP_OFFSET into pipe offset array
v7: Set I915_MAX_PIPES back to 3, change more registers accessors
to use the new macros, get rid of _PIPE_INC and add dev_priv
as a parameter where required by the new macros.
Upcoming hardware will not have the various display pipe register
ranges evenly spaced in memory. Change register address calculations
into array lookups.
Tested on SNB, VLV, IVB, Gen2 and HSW w/eDP.
I left the UMS cruft untouched.
Size differences:
text data bss dec hex filename
596431 4634 56 601121 92c21 i915.ko (new)
593199 4634 56 597889 91f81 i915.ko (old)
Signed-off-by: Antti Koskipaa <antti.koskipaa@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Tested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-02-04 12:22:24 +00:00
|
|
|
#define _HTOTAL_B 0x61000
|
|
|
|
#define _HBLANK_B 0x61004
|
|
|
|
#define _HSYNC_B 0x61008
|
|
|
|
#define _VTOTAL_B 0x6100c
|
|
|
|
#define _VBLANK_B 0x61010
|
|
|
|
#define _VSYNC_B 0x61014
|
|
|
|
#define _PIPEBSRC 0x6101c
|
|
|
|
#define _BCLRPAT_B 0x61020
|
|
|
|
#define _VSYNCSHIFT_B 0x61028
|
2014-09-30 17:30:22 +00:00
|
|
|
#define _PIPE_MULT_B 0x6102c
|
drm/i915: Reorganize display pipe register accesses
RFCv2: Reorganize array indexing so that full offsets can be used as
is. It makes grepping for registers in i915_reg.h much easier. Also
move offset arrays to intel_device_info.
v1: Fixed offsets for VLV, proper eDP handling
v2: Fixed BCLRPAT, PIPESRC, PIPECONF and DSP* macros.
v3: Added EDP pipe comment, removed redundant offset arrays for
MSA_MISC and DDI_FUNC_CTL.
v4: Rename patch and report object size increase.
v5: Change location of commas, add PIPE_EDP into enum pipe
v6: Insert PIPE_EDP_OFFSET into pipe offset array
v7: Set I915_MAX_PIPES back to 3, change more registers accessors
to use the new macros, get rid of _PIPE_INC and add dev_priv
as a parameter where required by the new macros.
Upcoming hardware will not have the various display pipe register
ranges evenly spaced in memory. Change register address calculations
into array lookups.
Tested on SNB, VLV, IVB, Gen2 and HSW w/eDP.
I left the UMS cruft untouched.
Size differences:
text data bss dec hex filename
596431 4634 56 601121 92c21 i915.ko (new)
593199 4634 56 597889 91f81 i915.ko (old)
Signed-off-by: Antti Koskipaa <antti.koskipaa@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Tested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-02-04 12:22:24 +00:00
|
|
|
|
|
|
|
#define TRANSCODER_A_OFFSET 0x60000
|
|
|
|
#define TRANSCODER_B_OFFSET 0x61000
|
|
|
|
#define TRANSCODER_C_OFFSET 0x62000
|
2014-04-28 11:00:42 +00:00
|
|
|
#define CHV_TRANSCODER_C_OFFSET 0x63000
|
drm/i915: Reorganize display pipe register accesses
RFCv2: Reorganize array indexing so that full offsets can be used as
is. It makes grepping for registers in i915_reg.h much easier. Also
move offset arrays to intel_device_info.
v1: Fixed offsets for VLV, proper eDP handling
v2: Fixed BCLRPAT, PIPESRC, PIPECONF and DSP* macros.
v3: Added EDP pipe comment, removed redundant offset arrays for
MSA_MISC and DDI_FUNC_CTL.
v4: Rename patch and report object size increase.
v5: Change location of commas, add PIPE_EDP into enum pipe
v6: Insert PIPE_EDP_OFFSET into pipe offset array
v7: Set I915_MAX_PIPES back to 3, change more registers accessors
to use the new macros, get rid of _PIPE_INC and add dev_priv
as a parameter where required by the new macros.
Upcoming hardware will not have the various display pipe register
ranges evenly spaced in memory. Change register address calculations
into array lookups.
Tested on SNB, VLV, IVB, Gen2 and HSW w/eDP.
I left the UMS cruft untouched.
Size differences:
text data bss dec hex filename
596431 4634 56 601121 92c21 i915.ko (new)
593199 4634 56 597889 91f81 i915.ko (old)
Signed-off-by: Antti Koskipaa <antti.koskipaa@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Tested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-02-04 12:22:24 +00:00
|
|
|
#define TRANSCODER_EDP_OFFSET 0x6f000
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define _MMIO_TRANS2(pipe, reg) _MMIO(dev_priv->info.trans_offsets[(pipe)] - \
|
2014-02-07 19:12:48 +00:00
|
|
|
dev_priv->info.trans_offsets[TRANSCODER_A] + (reg) + \
|
|
|
|
dev_priv->info.display_mmio_offset)
|
drm/i915: Reorganize display pipe register accesses
RFCv2: Reorganize array indexing so that full offsets can be used as
is. It makes grepping for registers in i915_reg.h much easier. Also
move offset arrays to intel_device_info.
v1: Fixed offsets for VLV, proper eDP handling
v2: Fixed BCLRPAT, PIPESRC, PIPECONF and DSP* macros.
v3: Added EDP pipe comment, removed redundant offset arrays for
MSA_MISC and DDI_FUNC_CTL.
v4: Rename patch and report object size increase.
v5: Change location of commas, add PIPE_EDP into enum pipe
v6: Insert PIPE_EDP_OFFSET into pipe offset array
v7: Set I915_MAX_PIPES back to 3, change more registers accessors
to use the new macros, get rid of _PIPE_INC and add dev_priv
as a parameter where required by the new macros.
Upcoming hardware will not have the various display pipe register
ranges evenly spaced in memory. Change register address calculations
into array lookups.
Tested on SNB, VLV, IVB, Gen2 and HSW w/eDP.
I left the UMS cruft untouched.
Size differences:
text data bss dec hex filename
596431 4634 56 601121 92c21 i915.ko (new)
593199 4634 56 597889 91f81 i915.ko (old)
Signed-off-by: Antti Koskipaa <antti.koskipaa@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Tested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-02-04 12:22:24 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define HTOTAL(trans) _MMIO_TRANS2(trans, _HTOTAL_A)
|
|
|
|
#define HBLANK(trans) _MMIO_TRANS2(trans, _HBLANK_A)
|
|
|
|
#define HSYNC(trans) _MMIO_TRANS2(trans, _HSYNC_A)
|
|
|
|
#define VTOTAL(trans) _MMIO_TRANS2(trans, _VTOTAL_A)
|
|
|
|
#define VBLANK(trans) _MMIO_TRANS2(trans, _VBLANK_A)
|
|
|
|
#define VSYNC(trans) _MMIO_TRANS2(trans, _VSYNC_A)
|
|
|
|
#define BCLRPAT(trans) _MMIO_TRANS2(trans, _BCLRPAT_A)
|
|
|
|
#define VSYNCSHIFT(trans) _MMIO_TRANS2(trans, _VSYNCSHIFT_A)
|
|
|
|
#define PIPESRC(trans) _MMIO_TRANS2(trans, _PIPEASRC)
|
|
|
|
#define PIPE_MULT(trans) _MMIO_TRANS2(trans, _PIPE_MULT_A)
|
2010-09-11 12:48:45 +00:00
|
|
|
|
2014-11-14 16:52:36 +00:00
|
|
|
/* VLV eDP PSR registers */
|
|
|
|
#define _PSRCTLA (VLV_DISPLAY_BASE + 0x60090)
|
|
|
|
#define _PSRCTLB (VLV_DISPLAY_BASE + 0x61090)
|
|
|
|
#define VLV_EDP_PSR_ENABLE (1<<0)
|
|
|
|
#define VLV_EDP_PSR_RESET (1<<1)
|
|
|
|
#define VLV_EDP_PSR_MODE_MASK (7<<2)
|
|
|
|
#define VLV_EDP_PSR_MODE_HW_TIMER (1<<3)
|
|
|
|
#define VLV_EDP_PSR_MODE_SW_TIMER (1<<2)
|
|
|
|
#define VLV_EDP_PSR_SINGLE_FRAME_UPDATE (1<<7)
|
|
|
|
#define VLV_EDP_PSR_ACTIVE_ENTRY (1<<8)
|
|
|
|
#define VLV_EDP_PSR_SRC_TRANSMITTER_STATE (1<<9)
|
|
|
|
#define VLV_EDP_PSR_DBL_FRAME (1<<10)
|
|
|
|
#define VLV_EDP_PSR_FRAME_COUNT_MASK (0xff<<16)
|
|
|
|
#define VLV_EDP_PSR_IDLE_FRAME_SHIFT 16
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define VLV_PSRCTL(pipe) _MMIO_PIPE(pipe, _PSRCTLA, _PSRCTLB)
|
2014-11-14 16:52:36 +00:00
|
|
|
|
|
|
|
#define _VSCSDPA (VLV_DISPLAY_BASE + 0x600a0)
|
|
|
|
#define _VSCSDPB (VLV_DISPLAY_BASE + 0x610a0)
|
|
|
|
#define VLV_EDP_PSR_SDP_FREQ_MASK (3<<30)
|
|
|
|
#define VLV_EDP_PSR_SDP_FREQ_ONCE (1<<31)
|
|
|
|
#define VLV_EDP_PSR_SDP_FREQ_EVFRAME (1<<30)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define VLV_VSCSDP(pipe) _MMIO_PIPE(pipe, _VSCSDPA, _VSCSDPB)
|
2014-11-14 16:52:36 +00:00
|
|
|
|
|
|
|
#define _PSRSTATA (VLV_DISPLAY_BASE + 0x60094)
|
|
|
|
#define _PSRSTATB (VLV_DISPLAY_BASE + 0x61094)
|
|
|
|
#define VLV_EDP_PSR_LAST_STATE_MASK (7<<3)
|
|
|
|
#define VLV_EDP_PSR_CURR_STATE_MASK 7
|
|
|
|
#define VLV_EDP_PSR_DISABLED (0<<0)
|
|
|
|
#define VLV_EDP_PSR_INACTIVE (1<<0)
|
|
|
|
#define VLV_EDP_PSR_IN_TRANS_TO_ACTIVE (2<<0)
|
|
|
|
#define VLV_EDP_PSR_ACTIVE_NORFB_UP (3<<0)
|
|
|
|
#define VLV_EDP_PSR_ACTIVE_SF_UPDATE (4<<0)
|
|
|
|
#define VLV_EDP_PSR_EXIT (5<<0)
|
|
|
|
#define VLV_EDP_PSR_IN_TRANS (1<<7)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define VLV_PSRSTAT(pipe) _MMIO_PIPE(pipe, _PSRSTATA, _PSRSTATB)
|
2014-11-14 16:52:36 +00:00
|
|
|
|
2013-11-05 06:45:05 +00:00
|
|
|
/* HSW+ eDP PSR registers */
|
2015-11-11 18:34:15 +00:00
|
|
|
#define HSW_EDP_PSR_BASE 0x64800
|
|
|
|
#define BDW_EDP_PSR_BASE 0x6f800
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define EDP_PSR_CTL _MMIO(dev_priv->psr_mmio_base + 0)
|
2013-07-11 21:44:58 +00:00
|
|
|
#define EDP_PSR_ENABLE (1<<31)
|
2014-06-12 17:16:42 +00:00
|
|
|
#define BDW_PSR_SINGLE_FRAME (1<<30)
|
2013-07-11 21:44:58 +00:00
|
|
|
#define EDP_PSR_LINK_STANDBY (1<<27)
|
|
|
|
#define EDP_PSR_MIN_LINK_ENTRY_TIME_MASK (3<<25)
|
|
|
|
#define EDP_PSR_MIN_LINK_ENTRY_TIME_8_LINES (0<<25)
|
|
|
|
#define EDP_PSR_MIN_LINK_ENTRY_TIME_4_LINES (1<<25)
|
|
|
|
#define EDP_PSR_MIN_LINK_ENTRY_TIME_2_LINES (2<<25)
|
|
|
|
#define EDP_PSR_MIN_LINK_ENTRY_TIME_0_LINES (3<<25)
|
|
|
|
#define EDP_PSR_MAX_SLEEP_TIME_SHIFT 20
|
|
|
|
#define EDP_PSR_SKIP_AUX_EXIT (1<<12)
|
|
|
|
#define EDP_PSR_TP1_TP2_SEL (0<<11)
|
|
|
|
#define EDP_PSR_TP1_TP3_SEL (1<<11)
|
|
|
|
#define EDP_PSR_TP2_TP3_TIME_500us (0<<8)
|
|
|
|
#define EDP_PSR_TP2_TP3_TIME_100us (1<<8)
|
|
|
|
#define EDP_PSR_TP2_TP3_TIME_2500us (2<<8)
|
|
|
|
#define EDP_PSR_TP2_TP3_TIME_0us (3<<8)
|
|
|
|
#define EDP_PSR_TP1_TIME_500us (0<<4)
|
|
|
|
#define EDP_PSR_TP1_TIME_100us (1<<4)
|
|
|
|
#define EDP_PSR_TP1_TIME_2500us (2<<4)
|
|
|
|
#define EDP_PSR_TP1_TIME_0us (3<<4)
|
|
|
|
#define EDP_PSR_IDLE_FRAME_SHIFT 0
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define EDP_PSR_AUX_CTL _MMIO(dev_priv->psr_mmio_base + 0x10)
|
|
|
|
#define EDP_PSR_AUX_DATA(i) _MMIO(dev_priv->psr_mmio_base + 0x14 + (i) * 4) /* 5 registers */
|
2013-07-11 21:44:58 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define EDP_PSR_STATUS_CTL _MMIO(dev_priv->psr_mmio_base + 0x40)
|
2013-07-11 21:44:58 +00:00
|
|
|
#define EDP_PSR_STATUS_STATE_MASK (7<<29)
|
2013-07-11 21:44:59 +00:00
|
|
|
#define EDP_PSR_STATUS_STATE_IDLE (0<<29)
|
|
|
|
#define EDP_PSR_STATUS_STATE_SRDONACK (1<<29)
|
|
|
|
#define EDP_PSR_STATUS_STATE_SRDENT (2<<29)
|
|
|
|
#define EDP_PSR_STATUS_STATE_BUFOFF (3<<29)
|
|
|
|
#define EDP_PSR_STATUS_STATE_BUFON (4<<29)
|
|
|
|
#define EDP_PSR_STATUS_STATE_AUXACK (5<<29)
|
|
|
|
#define EDP_PSR_STATUS_STATE_SRDOFFACK (6<<29)
|
|
|
|
#define EDP_PSR_STATUS_LINK_MASK (3<<26)
|
|
|
|
#define EDP_PSR_STATUS_LINK_FULL_OFF (0<<26)
|
|
|
|
#define EDP_PSR_STATUS_LINK_FULL_ON (1<<26)
|
|
|
|
#define EDP_PSR_STATUS_LINK_STANDBY (2<<26)
|
|
|
|
#define EDP_PSR_STATUS_MAX_SLEEP_TIMER_SHIFT 20
|
|
|
|
#define EDP_PSR_STATUS_MAX_SLEEP_TIMER_MASK 0x1f
|
|
|
|
#define EDP_PSR_STATUS_COUNT_SHIFT 16
|
|
|
|
#define EDP_PSR_STATUS_COUNT_MASK 0xf
|
|
|
|
#define EDP_PSR_STATUS_AUX_ERROR (1<<15)
|
|
|
|
#define EDP_PSR_STATUS_AUX_SENDING (1<<12)
|
|
|
|
#define EDP_PSR_STATUS_SENDING_IDLE (1<<9)
|
|
|
|
#define EDP_PSR_STATUS_SENDING_TP2_TP3 (1<<8)
|
|
|
|
#define EDP_PSR_STATUS_SENDING_TP1 (1<<4)
|
|
|
|
#define EDP_PSR_STATUS_IDLE_MASK 0xf
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define EDP_PSR_PERF_CNT _MMIO(dev_priv->psr_mmio_base + 0x44)
|
2013-07-11 21:44:59 +00:00
|
|
|
#define EDP_PSR_PERF_CNT_MASK 0xffffff
|
2013-07-11 21:44:58 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define EDP_PSR_DEBUG_CTL _MMIO(dev_priv->psr_mmio_base + 0x60)
|
2013-07-11 21:44:58 +00:00
|
|
|
#define EDP_PSR_DEBUG_MASK_LPSP (1<<27)
|
|
|
|
#define EDP_PSR_DEBUG_MASK_MEMUP (1<<26)
|
|
|
|
#define EDP_PSR_DEBUG_MASK_HPD (1<<25)
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define EDP_PSR2_CTL _MMIO(0x6f900)
|
2015-04-02 05:32:44 +00:00
|
|
|
#define EDP_PSR2_ENABLE (1<<31)
|
|
|
|
#define EDP_SU_TRACK_ENABLE (1<<30)
|
|
|
|
#define EDP_MAX_SU_DISABLE_TIME(t) ((t)<<20)
|
|
|
|
#define EDP_MAX_SU_DISABLE_TIME_MASK (0x1f<<20)
|
|
|
|
#define EDP_PSR2_TP2_TIME_500 (0<<8)
|
|
|
|
#define EDP_PSR2_TP2_TIME_100 (1<<8)
|
|
|
|
#define EDP_PSR2_TP2_TIME_2500 (2<<8)
|
|
|
|
#define EDP_PSR2_TP2_TIME_50 (3<<8)
|
|
|
|
#define EDP_PSR2_TP2_TIME_MASK (3<<8)
|
|
|
|
#define EDP_PSR2_FRAME_BEFORE_SU_SHIFT 4
|
|
|
|
#define EDP_PSR2_FRAME_BEFORE_SU_MASK (0xf<<4)
|
|
|
|
#define EDP_PSR2_IDLE_MASK 0xf
|
|
|
|
|
2008-07-29 18:54:06 +00:00
|
|
|
/* VGA port control */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define ADPA _MMIO(0x61100)
|
|
|
|
#define PCH_ADPA _MMIO(0xe1100)
|
|
|
|
#define VLV_ADPA _MMIO(VLV_DISPLAY_BASE + 0x61100)
|
2012-07-11 14:27:56 +00:00
|
|
|
|
2008-07-29 18:54:06 +00:00
|
|
|
#define ADPA_DAC_ENABLE (1<<31)
|
|
|
|
#define ADPA_DAC_DISABLE 0
|
|
|
|
#define ADPA_PIPE_SELECT_MASK (1<<30)
|
|
|
|
#define ADPA_PIPE_A_SELECT 0
|
|
|
|
#define ADPA_PIPE_B_SELECT (1<<30)
|
2011-08-06 17:35:34 +00:00
|
|
|
#define ADPA_PIPE_SELECT(pipe) ((pipe) << 30)
|
2012-07-11 14:27:56 +00:00
|
|
|
/* CPT uses bits 29:30 for pch transcoder select */
|
|
|
|
#define ADPA_CRT_HOTPLUG_MASK 0x03ff0000 /* bit 25-16 */
|
|
|
|
#define ADPA_CRT_HOTPLUG_MONITOR_NONE (0<<24)
|
|
|
|
#define ADPA_CRT_HOTPLUG_MONITOR_MASK (3<<24)
|
|
|
|
#define ADPA_CRT_HOTPLUG_MONITOR_COLOR (3<<24)
|
|
|
|
#define ADPA_CRT_HOTPLUG_MONITOR_MONO (2<<24)
|
|
|
|
#define ADPA_CRT_HOTPLUG_ENABLE (1<<23)
|
|
|
|
#define ADPA_CRT_HOTPLUG_PERIOD_64 (0<<22)
|
|
|
|
#define ADPA_CRT_HOTPLUG_PERIOD_128 (1<<22)
|
|
|
|
#define ADPA_CRT_HOTPLUG_WARMUP_5MS (0<<21)
|
|
|
|
#define ADPA_CRT_HOTPLUG_WARMUP_10MS (1<<21)
|
|
|
|
#define ADPA_CRT_HOTPLUG_SAMPLE_2S (0<<20)
|
|
|
|
#define ADPA_CRT_HOTPLUG_SAMPLE_4S (1<<20)
|
|
|
|
#define ADPA_CRT_HOTPLUG_VOLTAGE_40 (0<<18)
|
|
|
|
#define ADPA_CRT_HOTPLUG_VOLTAGE_50 (1<<18)
|
|
|
|
#define ADPA_CRT_HOTPLUG_VOLTAGE_60 (2<<18)
|
|
|
|
#define ADPA_CRT_HOTPLUG_VOLTAGE_70 (3<<18)
|
|
|
|
#define ADPA_CRT_HOTPLUG_VOLREF_325MV (0<<17)
|
|
|
|
#define ADPA_CRT_HOTPLUG_VOLREF_475MV (1<<17)
|
|
|
|
#define ADPA_CRT_HOTPLUG_FORCE_TRIGGER (1<<16)
|
2008-07-29 18:54:06 +00:00
|
|
|
#define ADPA_USE_VGA_HVPOLARITY (1<<15)
|
|
|
|
#define ADPA_SETS_HVPOLARITY 0
|
2013-03-05 18:09:37 +00:00
|
|
|
#define ADPA_VSYNC_CNTL_DISABLE (1<<10)
|
2008-07-29 18:54:06 +00:00
|
|
|
#define ADPA_VSYNC_CNTL_ENABLE 0
|
2013-03-05 18:09:37 +00:00
|
|
|
#define ADPA_HSYNC_CNTL_DISABLE (1<<11)
|
2008-07-29 18:54:06 +00:00
|
|
|
#define ADPA_HSYNC_CNTL_ENABLE 0
|
|
|
|
#define ADPA_VSYNC_ACTIVE_HIGH (1<<4)
|
|
|
|
#define ADPA_VSYNC_ACTIVE_LOW 0
|
|
|
|
#define ADPA_HSYNC_ACTIVE_HIGH (1<<3)
|
|
|
|
#define ADPA_HSYNC_ACTIVE_LOW 0
|
|
|
|
#define ADPA_DPMS_MASK (~(3<<10))
|
|
|
|
#define ADPA_DPMS_ON (0<<10)
|
|
|
|
#define ADPA_DPMS_SUSPEND (1<<10)
|
|
|
|
#define ADPA_DPMS_STANDBY (2<<10)
|
|
|
|
#define ADPA_DPMS_OFF (3<<10)
|
|
|
|
|
2010-10-09 09:33:26 +00:00
|
|
|
|
2008-07-29 18:54:06 +00:00
|
|
|
/* Hotplug control (945+ only) */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define PORT_HOTPLUG_EN _MMIO(dev_priv->info.display_mmio_offset + 0x61110)
|
2013-02-07 11:42:32 +00:00
|
|
|
#define PORTB_HOTPLUG_INT_EN (1 << 29)
|
|
|
|
#define PORTC_HOTPLUG_INT_EN (1 << 28)
|
|
|
|
#define PORTD_HOTPLUG_INT_EN (1 << 27)
|
2008-07-29 18:54:06 +00:00
|
|
|
#define SDVOB_HOTPLUG_INT_EN (1 << 26)
|
|
|
|
#define SDVOC_HOTPLUG_INT_EN (1 << 25)
|
|
|
|
#define TV_HOTPLUG_INT_EN (1 << 18)
|
|
|
|
#define CRT_HOTPLUG_INT_EN (1 << 9)
|
2013-02-28 09:17:12 +00:00
|
|
|
#define HOTPLUG_INT_EN_MASK (PORTB_HOTPLUG_INT_EN | \
|
|
|
|
PORTC_HOTPLUG_INT_EN | \
|
|
|
|
PORTD_HOTPLUG_INT_EN | \
|
|
|
|
SDVOC_HOTPLUG_INT_EN | \
|
|
|
|
SDVOB_HOTPLUG_INT_EN | \
|
|
|
|
CRT_HOTPLUG_INT_EN)
|
2008-07-29 18:54:06 +00:00
|
|
|
#define CRT_HOTPLUG_FORCE_DETECT (1 << 3)
|
2009-03-03 10:07:52 +00:00
|
|
|
#define CRT_HOTPLUG_ACTIVATION_PERIOD_32 (0 << 8)
|
|
|
|
/* must use period 64 on GM45 according to docs */
|
|
|
|
#define CRT_HOTPLUG_ACTIVATION_PERIOD_64 (1 << 8)
|
|
|
|
#define CRT_HOTPLUG_DAC_ON_TIME_2M (0 << 7)
|
|
|
|
#define CRT_HOTPLUG_DAC_ON_TIME_4M (1 << 7)
|
|
|
|
#define CRT_HOTPLUG_VOLTAGE_COMPARE_40 (0 << 5)
|
|
|
|
#define CRT_HOTPLUG_VOLTAGE_COMPARE_50 (1 << 5)
|
|
|
|
#define CRT_HOTPLUG_VOLTAGE_COMPARE_60 (2 << 5)
|
|
|
|
#define CRT_HOTPLUG_VOLTAGE_COMPARE_70 (3 << 5)
|
|
|
|
#define CRT_HOTPLUG_VOLTAGE_COMPARE_MASK (3 << 5)
|
|
|
|
#define CRT_HOTPLUG_DETECT_DELAY_1G (0 << 4)
|
|
|
|
#define CRT_HOTPLUG_DETECT_DELAY_2G (1 << 4)
|
|
|
|
#define CRT_HOTPLUG_DETECT_VOLTAGE_325MV (0 << 2)
|
|
|
|
#define CRT_HOTPLUG_DETECT_VOLTAGE_475MV (1 << 2)
|
2008-07-29 18:54:06 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define PORT_HOTPLUG_STAT _MMIO(dev_priv->info.display_mmio_offset + 0x61114)
|
2013-07-26 09:27:49 +00:00
|
|
|
/*
|
2016-02-10 17:59:05 +00:00
|
|
|
* HDMI/DP bits are g4x+
|
2013-07-26 09:27:49 +00:00
|
|
|
*
|
|
|
|
* WARNING: Bspec for hpd status bits on gen4 seems to be completely confused.
|
|
|
|
* Please check the detailed lore in the commit message for for experimental
|
|
|
|
* evidence.
|
|
|
|
*/
|
2016-02-10 17:59:05 +00:00
|
|
|
/* Bspec says GM45 should match G4X/VLV/CHV, but reality disagrees */
|
|
|
|
#define PORTD_HOTPLUG_LIVE_STATUS_GM45 (1 << 29)
|
|
|
|
#define PORTC_HOTPLUG_LIVE_STATUS_GM45 (1 << 28)
|
|
|
|
#define PORTB_HOTPLUG_LIVE_STATUS_GM45 (1 << 27)
|
|
|
|
/* G4X/VLV/CHV DP/HDMI bits again match Bspec */
|
|
|
|
#define PORTD_HOTPLUG_LIVE_STATUS_G4X (1 << 27)
|
2014-01-23 07:13:41 +00:00
|
|
|
#define PORTC_HOTPLUG_LIVE_STATUS_G4X (1 << 28)
|
2016-02-10 17:59:05 +00:00
|
|
|
#define PORTB_HOTPLUG_LIVE_STATUS_G4X (1 << 29)
|
2013-02-07 11:42:32 +00:00
|
|
|
#define PORTD_HOTPLUG_INT_STATUS (3 << 21)
|
2014-06-05 07:36:23 +00:00
|
|
|
#define PORTD_HOTPLUG_INT_LONG_PULSE (2 << 21)
|
|
|
|
#define PORTD_HOTPLUG_INT_SHORT_PULSE (1 << 21)
|
2013-02-07 11:42:32 +00:00
|
|
|
#define PORTC_HOTPLUG_INT_STATUS (3 << 19)
|
2014-06-05 07:36:23 +00:00
|
|
|
#define PORTC_HOTPLUG_INT_LONG_PULSE (2 << 19)
|
|
|
|
#define PORTC_HOTPLUG_INT_SHORT_PULSE (1 << 19)
|
2013-02-07 11:42:32 +00:00
|
|
|
#define PORTB_HOTPLUG_INT_STATUS (3 << 17)
|
2014-06-05 07:36:23 +00:00
|
|
|
#define PORTB_HOTPLUG_INT_LONG_PULSE (2 << 17)
|
|
|
|
#define PORTB_HOTPLUG_INT_SHORT_PLUSE (1 << 17)
|
2012-05-11 17:01:33 +00:00
|
|
|
/* CRT/TV common between gen3+ */
|
2008-07-29 18:54:06 +00:00
|
|
|
#define CRT_HOTPLUG_INT_STATUS (1 << 11)
|
|
|
|
#define TV_HOTPLUG_INT_STATUS (1 << 10)
|
|
|
|
#define CRT_HOTPLUG_MONITOR_MASK (3 << 8)
|
|
|
|
#define CRT_HOTPLUG_MONITOR_COLOR (3 << 8)
|
|
|
|
#define CRT_HOTPLUG_MONITOR_MONO (2 << 8)
|
|
|
|
#define CRT_HOTPLUG_MONITOR_NONE (0 << 8)
|
2013-10-31 08:53:36 +00:00
|
|
|
#define DP_AUX_CHANNEL_D_INT_STATUS_G4X (1 << 6)
|
|
|
|
#define DP_AUX_CHANNEL_C_INT_STATUS_G4X (1 << 5)
|
|
|
|
#define DP_AUX_CHANNEL_B_INT_STATUS_G4X (1 << 4)
|
2014-01-16 17:56:53 +00:00
|
|
|
#define DP_AUX_CHANNEL_MASK_INT_STATUS_G4X (7 << 4)
|
|
|
|
|
2012-05-11 17:01:33 +00:00
|
|
|
/* SDVO is different across gen3/4 */
|
|
|
|
#define SDVOC_HOTPLUG_INT_STATUS_G4X (1 << 3)
|
|
|
|
#define SDVOB_HOTPLUG_INT_STATUS_G4X (1 << 2)
|
2013-06-24 19:33:28 +00:00
|
|
|
/*
|
|
|
|
* Bspec seems to be seriously misleaded about the SDVO hpd bits on i965g/gm,
|
|
|
|
* since reality corrobates that they're the same as on gen3. But keep these
|
|
|
|
* bits here (and the comment!) to help any other lost wanderers back onto the
|
|
|
|
* right tracks.
|
|
|
|
*/
|
2012-05-11 17:01:33 +00:00
|
|
|
#define SDVOC_HOTPLUG_INT_STATUS_I965 (3 << 4)
|
|
|
|
#define SDVOB_HOTPLUG_INT_STATUS_I965 (3 << 2)
|
|
|
|
#define SDVOC_HOTPLUG_INT_STATUS_I915 (1 << 7)
|
|
|
|
#define SDVOB_HOTPLUG_INT_STATUS_I915 (1 << 6)
|
2013-02-28 09:17:12 +00:00
|
|
|
#define HOTPLUG_INT_STATUS_G4X (CRT_HOTPLUG_INT_STATUS | \
|
|
|
|
SDVOB_HOTPLUG_INT_STATUS_G4X | \
|
|
|
|
SDVOC_HOTPLUG_INT_STATUS_G4X | \
|
|
|
|
PORTB_HOTPLUG_INT_STATUS | \
|
|
|
|
PORTC_HOTPLUG_INT_STATUS | \
|
|
|
|
PORTD_HOTPLUG_INT_STATUS)
|
|
|
|
|
|
|
|
#define HOTPLUG_INT_STATUS_I915 (CRT_HOTPLUG_INT_STATUS | \
|
|
|
|
SDVOB_HOTPLUG_INT_STATUS_I915 | \
|
|
|
|
SDVOC_HOTPLUG_INT_STATUS_I915 | \
|
|
|
|
PORTB_HOTPLUG_INT_STATUS | \
|
|
|
|
PORTC_HOTPLUG_INT_STATUS | \
|
|
|
|
PORTD_HOTPLUG_INT_STATUS)
|
2008-07-29 18:54:06 +00:00
|
|
|
|
2013-02-19 19:21:45 +00:00
|
|
|
/* SDVO and HDMI port control.
|
|
|
|
* The same register may be used for SDVO or HDMI */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define _GEN3_SDVOB 0x61140
|
|
|
|
#define _GEN3_SDVOC 0x61160
|
|
|
|
#define GEN3_SDVOB _MMIO(_GEN3_SDVOB)
|
|
|
|
#define GEN3_SDVOC _MMIO(_GEN3_SDVOC)
|
2013-02-19 19:21:45 +00:00
|
|
|
#define GEN4_HDMIB GEN3_SDVOB
|
|
|
|
#define GEN4_HDMIC GEN3_SDVOC
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define VLV_HDMIB _MMIO(VLV_DISPLAY_BASE + 0x61140)
|
|
|
|
#define VLV_HDMIC _MMIO(VLV_DISPLAY_BASE + 0x61160)
|
|
|
|
#define CHV_HDMID _MMIO(VLV_DISPLAY_BASE + 0x6116C)
|
|
|
|
#define PCH_SDVOB _MMIO(0xe1140)
|
2013-02-19 19:21:45 +00:00
|
|
|
#define PCH_HDMIB PCH_SDVOB
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define PCH_HDMIC _MMIO(0xe1150)
|
|
|
|
#define PCH_HDMID _MMIO(0xe1160)
|
2013-02-19 19:21:45 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define PORT_DFT_I9XX _MMIO(0x61150)
|
2013-11-01 09:50:21 +00:00
|
|
|
#define DC_BALANCE_RESET (1 << 25)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define PORT_DFT2_G4X _MMIO(dev_priv->info.display_mmio_offset + 0x61154)
|
2013-11-01 09:50:21 +00:00
|
|
|
#define DC_BALANCE_RESET_VLV (1 << 31)
|
2014-12-09 19:28:28 +00:00
|
|
|
#define PIPE_SCRAMBLE_RESET_MASK ((1 << 14) | (0x3 << 0))
|
|
|
|
#define PIPE_C_SCRAMBLE_RESET (1 << 14) /* chv */
|
2013-11-01 09:50:21 +00:00
|
|
|
#define PIPE_B_SCRAMBLE_RESET (1 << 1)
|
|
|
|
#define PIPE_A_SCRAMBLE_RESET (1 << 0)
|
|
|
|
|
2013-02-19 19:21:45 +00:00
|
|
|
/* Gen 3 SDVO bits: */
|
|
|
|
#define SDVO_ENABLE (1 << 31)
|
2013-02-19 19:21:46 +00:00
|
|
|
#define SDVO_PIPE_SEL(pipe) ((pipe) << 30)
|
|
|
|
#define SDVO_PIPE_SEL_MASK (1 << 30)
|
2013-02-19 19:21:45 +00:00
|
|
|
#define SDVO_PIPE_B_SELECT (1 << 30)
|
|
|
|
#define SDVO_STALL_SELECT (1 << 29)
|
|
|
|
#define SDVO_INTERRUPT_ENABLE (1 << 26)
|
2014-04-25 17:14:30 +00:00
|
|
|
/*
|
2008-07-29 18:54:06 +00:00
|
|
|
* 915G/GM SDVO pixel multiplier.
|
|
|
|
* Programmed value is multiplier - 1, up to 5x.
|
|
|
|
* \sa DPLL_MD_UDI_MULTIPLIER_MASK
|
|
|
|
*/
|
2013-02-19 19:21:45 +00:00
|
|
|
#define SDVO_PORT_MULTIPLY_MASK (7 << 23)
|
2008-07-29 18:54:06 +00:00
|
|
|
#define SDVO_PORT_MULTIPLY_SHIFT 23
|
2013-02-19 19:21:45 +00:00
|
|
|
#define SDVO_PHASE_SELECT_MASK (15 << 19)
|
|
|
|
#define SDVO_PHASE_SELECT_DEFAULT (6 << 19)
|
|
|
|
#define SDVO_CLOCK_OUTPUT_INVERT (1 << 18)
|
|
|
|
#define SDVOC_GANG_MODE (1 << 16) /* Port C only */
|
|
|
|
#define SDVO_BORDER_ENABLE (1 << 7) /* SDVO only */
|
|
|
|
#define SDVOB_PCIE_CONCURRENCY (1 << 3) /* Port B only */
|
|
|
|
#define SDVO_DETECTED (1 << 2)
|
2008-07-29 18:54:06 +00:00
|
|
|
/* Bits to be preserved when writing */
|
2013-02-19 19:21:45 +00:00
|
|
|
#define SDVOB_PRESERVE_MASK ((1 << 17) | (1 << 16) | (1 << 14) | \
|
|
|
|
SDVO_INTERRUPT_ENABLE)
|
|
|
|
#define SDVOC_PRESERVE_MASK ((1 << 17) | SDVO_INTERRUPT_ENABLE)
|
|
|
|
|
|
|
|
/* Gen 4 SDVO/HDMI bits: */
|
2013-02-19 19:21:47 +00:00
|
|
|
#define SDVO_COLOR_FORMAT_8bpc (0 << 26)
|
2013-09-13 13:00:08 +00:00
|
|
|
#define SDVO_COLOR_FORMAT_MASK (7 << 26)
|
2013-02-19 19:21:45 +00:00
|
|
|
#define SDVO_ENCODING_SDVO (0 << 10)
|
|
|
|
#define SDVO_ENCODING_HDMI (2 << 10)
|
2013-02-19 19:21:46 +00:00
|
|
|
#define HDMI_MODE_SELECT_HDMI (1 << 9) /* HDMI only */
|
|
|
|
#define HDMI_MODE_SELECT_DVI (0 << 9) /* HDMI only */
|
2013-02-19 19:21:47 +00:00
|
|
|
#define HDMI_COLOR_RANGE_16_235 (1 << 8) /* HDMI only */
|
2013-02-19 19:21:45 +00:00
|
|
|
#define SDVO_AUDIO_ENABLE (1 << 6)
|
|
|
|
/* VSYNC/HSYNC bits new with 965, default is to be set */
|
|
|
|
#define SDVO_VSYNC_ACTIVE_HIGH (1 << 4)
|
|
|
|
#define SDVO_HSYNC_ACTIVE_HIGH (1 << 3)
|
|
|
|
|
|
|
|
/* Gen 5 (IBX) SDVO/HDMI bits: */
|
2013-02-19 19:21:47 +00:00
|
|
|
#define HDMI_COLOR_FORMAT_12bpc (3 << 26) /* HDMI only */
|
2013-02-19 19:21:45 +00:00
|
|
|
#define SDVOB_HOTPLUG_ENABLE (1 << 23) /* SDVO only */
|
|
|
|
|
|
|
|
/* Gen 6 (CPT) SDVO/HDMI bits: */
|
2013-02-19 19:21:46 +00:00
|
|
|
#define SDVO_PIPE_SEL_CPT(pipe) ((pipe) << 29)
|
|
|
|
#define SDVO_PIPE_SEL_MASK_CPT (3 << 29)
|
2013-02-19 19:21:45 +00:00
|
|
|
|
2014-04-09 10:28:21 +00:00
|
|
|
/* CHV SDVO/HDMI bits: */
|
|
|
|
#define SDVO_PIPE_SEL_CHV(pipe) ((pipe) << 24)
|
|
|
|
#define SDVO_PIPE_SEL_MASK_CHV (3 << 24)
|
|
|
|
|
2008-07-29 18:54:06 +00:00
|
|
|
|
|
|
|
/* DVO port control */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define _DVOA 0x61120
|
|
|
|
#define DVOA _MMIO(_DVOA)
|
|
|
|
#define _DVOB 0x61140
|
|
|
|
#define DVOB _MMIO(_DVOB)
|
|
|
|
#define _DVOC 0x61160
|
|
|
|
#define DVOC _MMIO(_DVOC)
|
2008-07-29 18:54:06 +00:00
|
|
|
#define DVO_ENABLE (1 << 31)
|
|
|
|
#define DVO_PIPE_B_SELECT (1 << 30)
|
|
|
|
#define DVO_PIPE_STALL_UNUSED (0 << 28)
|
|
|
|
#define DVO_PIPE_STALL (1 << 28)
|
|
|
|
#define DVO_PIPE_STALL_TV (2 << 28)
|
|
|
|
#define DVO_PIPE_STALL_MASK (3 << 28)
|
|
|
|
#define DVO_USE_VGA_SYNC (1 << 15)
|
|
|
|
#define DVO_DATA_ORDER_I740 (0 << 14)
|
|
|
|
#define DVO_DATA_ORDER_FP (1 << 14)
|
|
|
|
#define DVO_VSYNC_DISABLE (1 << 11)
|
|
|
|
#define DVO_HSYNC_DISABLE (1 << 10)
|
|
|
|
#define DVO_VSYNC_TRISTATE (1 << 9)
|
|
|
|
#define DVO_HSYNC_TRISTATE (1 << 8)
|
|
|
|
#define DVO_BORDER_ENABLE (1 << 7)
|
|
|
|
#define DVO_DATA_ORDER_GBRG (1 << 6)
|
|
|
|
#define DVO_DATA_ORDER_RGGB (0 << 6)
|
|
|
|
#define DVO_DATA_ORDER_GBRG_ERRATA (0 << 6)
|
|
|
|
#define DVO_DATA_ORDER_RGGB_ERRATA (1 << 6)
|
|
|
|
#define DVO_VSYNC_ACTIVE_HIGH (1 << 4)
|
|
|
|
#define DVO_HSYNC_ACTIVE_HIGH (1 << 3)
|
|
|
|
#define DVO_BLANK_ACTIVE_HIGH (1 << 2)
|
|
|
|
#define DVO_OUTPUT_CSTATE_PIXELS (1 << 1) /* SDG only */
|
|
|
|
#define DVO_OUTPUT_SOURCE_SIZE_PIXELS (1 << 0) /* SDG only */
|
|
|
|
#define DVO_PRESERVE_MASK (0x7<<24)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define DVOA_SRCDIM _MMIO(0x61124)
|
|
|
|
#define DVOB_SRCDIM _MMIO(0x61144)
|
|
|
|
#define DVOC_SRCDIM _MMIO(0x61164)
|
2008-07-29 18:54:06 +00:00
|
|
|
#define DVO_SRCDIM_HORIZONTAL_SHIFT 12
|
|
|
|
#define DVO_SRCDIM_VERTICAL_SHIFT 0
|
|
|
|
|
|
|
|
/* LVDS port control */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define LVDS _MMIO(0x61180)
|
2008-07-29 18:54:06 +00:00
|
|
|
/*
|
|
|
|
* Enables the LVDS port. This bit must be set before DPLLs are enabled, as
|
|
|
|
* the DPLL semantics change when the LVDS is assigned to that pipe.
|
|
|
|
*/
|
|
|
|
#define LVDS_PORT_EN (1 << 31)
|
|
|
|
/* Selects pipe B for LVDS data. Must be set on pre-965. */
|
|
|
|
#define LVDS_PIPEB_SELECT (1 << 30)
|
2011-02-07 21:46:40 +00:00
|
|
|
#define LVDS_PIPE_MASK (1 << 30)
|
2011-08-06 17:35:34 +00:00
|
|
|
#define LVDS_PIPE(pipe) ((pipe) << 30)
|
2010-01-04 08:29:30 +00:00
|
|
|
/* LVDS dithering flag on 965/g4x platform */
|
|
|
|
#define LVDS_ENABLE_DITHER (1 << 25)
|
2011-01-12 21:43:19 +00:00
|
|
|
/* LVDS sync polarity flags. Set to invert (i.e. negative) */
|
|
|
|
#define LVDS_VSYNC_POLARITY (1 << 21)
|
|
|
|
#define LVDS_HSYNC_POLARITY (1 << 20)
|
|
|
|
|
2009-10-10 02:42:37 +00:00
|
|
|
/* Enable border for unscaled (or aspect-scaled) display */
|
|
|
|
#define LVDS_BORDER_ENABLE (1 << 15)
|
2008-07-29 18:54:06 +00:00
|
|
|
/*
|
|
|
|
* Enables the A0-A2 data pairs and CLKA, containing 18 bits of color data per
|
|
|
|
* pixel.
|
|
|
|
*/
|
|
|
|
#define LVDS_A0A2_CLKA_POWER_MASK (3 << 8)
|
|
|
|
#define LVDS_A0A2_CLKA_POWER_DOWN (0 << 8)
|
|
|
|
#define LVDS_A0A2_CLKA_POWER_UP (3 << 8)
|
|
|
|
/*
|
|
|
|
* Controls the A3 data pair, which contains the additional LSBs for 24 bit
|
|
|
|
* mode. Only enabled if LVDS_A0A2_CLKA_POWER_UP also indicates it should be
|
|
|
|
* on.
|
|
|
|
*/
|
|
|
|
#define LVDS_A3_POWER_MASK (3 << 6)
|
|
|
|
#define LVDS_A3_POWER_DOWN (0 << 6)
|
|
|
|
#define LVDS_A3_POWER_UP (3 << 6)
|
|
|
|
/*
|
|
|
|
* Controls the CLKB pair. This should only be set when LVDS_B0B3_POWER_UP
|
|
|
|
* is set.
|
|
|
|
*/
|
|
|
|
#define LVDS_CLKB_POWER_MASK (3 << 4)
|
|
|
|
#define LVDS_CLKB_POWER_DOWN (0 << 4)
|
|
|
|
#define LVDS_CLKB_POWER_UP (3 << 4)
|
|
|
|
/*
|
|
|
|
* Controls the B0-B3 data pairs. This must be set to match the DPLL p2
|
|
|
|
* setting for whether we are in dual-channel mode. The B3 pair will
|
|
|
|
* additionally only be powered up when LVDS_A3_POWER_UP is set.
|
|
|
|
*/
|
|
|
|
#define LVDS_B0B3_POWER_MASK (3 << 2)
|
|
|
|
#define LVDS_B0B3_POWER_DOWN (0 << 2)
|
|
|
|
#define LVDS_B0B3_POWER_UP (3 << 2)
|
|
|
|
|
2010-09-24 19:44:32 +00:00
|
|
|
/* Video Data Island Packet control */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define VIDEO_DIP_DATA _MMIO(0x61178)
|
2015-02-28 16:20:41 +00:00
|
|
|
/* Read the description of VIDEO_DIP_DATA (before Haswell) or VIDEO_DIP_ECC
|
2012-09-25 16:23:34 +00:00
|
|
|
* (Haswell and newer) to see which VIDEO_DIP_DATA byte corresponds to each byte
|
|
|
|
* of the infoframe structure specified by CEA-861. */
|
|
|
|
#define VIDEO_DIP_DATA_SIZE 32
|
2013-07-11 21:44:58 +00:00
|
|
|
#define VIDEO_DIP_VSC_DATA_SIZE 36
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define VIDEO_DIP_CTL _MMIO(0x61170)
|
2012-05-14 20:12:51 +00:00
|
|
|
/* Pre HSW: */
|
2010-09-24 19:44:32 +00:00
|
|
|
#define VIDEO_DIP_ENABLE (1 << 31)
|
2014-01-23 21:15:34 +00:00
|
|
|
#define VIDEO_DIP_PORT(port) ((port) << 29)
|
2012-05-04 20:18:19 +00:00
|
|
|
#define VIDEO_DIP_PORT_MASK (3 << 29)
|
2012-05-28 19:42:53 +00:00
|
|
|
#define VIDEO_DIP_ENABLE_GCP (1 << 25)
|
2010-09-24 19:44:32 +00:00
|
|
|
#define VIDEO_DIP_ENABLE_AVI (1 << 21)
|
|
|
|
#define VIDEO_DIP_ENABLE_VENDOR (2 << 21)
|
2012-05-28 19:42:53 +00:00
|
|
|
#define VIDEO_DIP_ENABLE_GAMUT (4 << 21)
|
2010-09-24 19:44:32 +00:00
|
|
|
#define VIDEO_DIP_ENABLE_SPD (8 << 21)
|
|
|
|
#define VIDEO_DIP_SELECT_AVI (0 << 19)
|
|
|
|
#define VIDEO_DIP_SELECT_VENDOR (1 << 19)
|
|
|
|
#define VIDEO_DIP_SELECT_SPD (3 << 19)
|
2011-08-03 16:22:55 +00:00
|
|
|
#define VIDEO_DIP_SELECT_MASK (3 << 19)
|
2010-09-24 19:44:32 +00:00
|
|
|
#define VIDEO_DIP_FREQ_ONCE (0 << 16)
|
|
|
|
#define VIDEO_DIP_FREQ_VSYNC (1 << 16)
|
|
|
|
#define VIDEO_DIP_FREQ_2VSYNC (2 << 16)
|
2012-05-04 20:18:22 +00:00
|
|
|
#define VIDEO_DIP_FREQ_MASK (3 << 16)
|
2012-05-14 20:12:51 +00:00
|
|
|
/* HSW and later: */
|
2012-05-28 19:42:53 +00:00
|
|
|
#define VIDEO_DIP_ENABLE_VSC_HSW (1 << 20)
|
|
|
|
#define VIDEO_DIP_ENABLE_GCP_HSW (1 << 16)
|
2012-05-14 20:12:51 +00:00
|
|
|
#define VIDEO_DIP_ENABLE_AVI_HSW (1 << 12)
|
2012-05-28 19:42:53 +00:00
|
|
|
#define VIDEO_DIP_ENABLE_VS_HSW (1 << 8)
|
|
|
|
#define VIDEO_DIP_ENABLE_GMP_HSW (1 << 4)
|
2012-05-14 20:12:51 +00:00
|
|
|
#define VIDEO_DIP_ENABLE_SPD_HSW (1 << 0)
|
2010-09-24 19:44:32 +00:00
|
|
|
|
2008-07-29 18:54:06 +00:00
|
|
|
/* Panel power sequencing */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define PP_STATUS _MMIO(0x61200)
|
2008-07-29 18:54:06 +00:00
|
|
|
#define PP_ON (1 << 31)
|
|
|
|
/*
|
|
|
|
* Indicates that all dependencies of the panel are on:
|
|
|
|
*
|
|
|
|
* - PLL enabled
|
|
|
|
* - pipe enabled
|
|
|
|
* - LVDS/DVOB/DVOC on
|
|
|
|
*/
|
|
|
|
#define PP_READY (1 << 30)
|
|
|
|
#define PP_SEQUENCE_NONE (0 << 28)
|
2011-11-02 02:57:50 +00:00
|
|
|
#define PP_SEQUENCE_POWER_UP (1 << 28)
|
|
|
|
#define PP_SEQUENCE_POWER_DOWN (2 << 28)
|
|
|
|
#define PP_SEQUENCE_MASK (3 << 28)
|
|
|
|
#define PP_SEQUENCE_SHIFT 28
|
2010-10-07 23:01:12 +00:00
|
|
|
#define PP_CYCLE_DELAY_ACTIVE (1 << 27)
|
|
|
|
#define PP_SEQUENCE_STATE_MASK 0x0000000f
|
2011-11-02 02:57:50 +00:00
|
|
|
#define PP_SEQUENCE_STATE_OFF_IDLE (0x0 << 0)
|
|
|
|
#define PP_SEQUENCE_STATE_OFF_S0_1 (0x1 << 0)
|
|
|
|
#define PP_SEQUENCE_STATE_OFF_S0_2 (0x2 << 0)
|
|
|
|
#define PP_SEQUENCE_STATE_OFF_S0_3 (0x3 << 0)
|
|
|
|
#define PP_SEQUENCE_STATE_ON_IDLE (0x8 << 0)
|
|
|
|
#define PP_SEQUENCE_STATE_ON_S1_0 (0x9 << 0)
|
|
|
|
#define PP_SEQUENCE_STATE_ON_S1_2 (0xa << 0)
|
|
|
|
#define PP_SEQUENCE_STATE_ON_S1_3 (0xb << 0)
|
|
|
|
#define PP_SEQUENCE_STATE_RESET (0xf << 0)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define PP_CONTROL _MMIO(0x61204)
|
2008-07-29 18:54:06 +00:00
|
|
|
#define POWER_TARGET_ON (1 << 0)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define PP_ON_DELAYS _MMIO(0x61208)
|
|
|
|
#define PP_OFF_DELAYS _MMIO(0x6120c)
|
|
|
|
#define PP_DIVISOR _MMIO(0x61210)
|
2008-07-29 18:54:06 +00:00
|
|
|
|
|
|
|
/* Panel fitting */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define PFIT_CONTROL _MMIO(dev_priv->info.display_mmio_offset + 0x61230)
|
2008-07-29 18:54:06 +00:00
|
|
|
#define PFIT_ENABLE (1 << 31)
|
|
|
|
#define PFIT_PIPE_MASK (3 << 29)
|
|
|
|
#define PFIT_PIPE_SHIFT 29
|
|
|
|
#define VERT_INTERP_DISABLE (0 << 10)
|
|
|
|
#define VERT_INTERP_BILINEAR (1 << 10)
|
|
|
|
#define VERT_INTERP_MASK (3 << 10)
|
|
|
|
#define VERT_AUTO_SCALE (1 << 9)
|
|
|
|
#define HORIZ_INTERP_DISABLE (0 << 6)
|
|
|
|
#define HORIZ_INTERP_BILINEAR (1 << 6)
|
|
|
|
#define HORIZ_INTERP_MASK (3 << 6)
|
|
|
|
#define HORIZ_AUTO_SCALE (1 << 5)
|
|
|
|
#define PANEL_8TO6_DITHER_ENABLE (1 << 3)
|
2009-06-22 07:31:25 +00:00
|
|
|
#define PFIT_FILTER_FUZZY (0 << 24)
|
|
|
|
#define PFIT_SCALING_AUTO (0 << 26)
|
|
|
|
#define PFIT_SCALING_PROGRAMMED (1 << 26)
|
|
|
|
#define PFIT_SCALING_PILLAR (2 << 26)
|
|
|
|
#define PFIT_SCALING_LETTER (3 << 26)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define PFIT_PGM_RATIOS _MMIO(dev_priv->info.display_mmio_offset + 0x61234)
|
2009-06-22 07:31:25 +00:00
|
|
|
/* Pre-965 */
|
|
|
|
#define PFIT_VERT_SCALE_SHIFT 20
|
|
|
|
#define PFIT_VERT_SCALE_MASK 0xfff00000
|
|
|
|
#define PFIT_HORIZ_SCALE_SHIFT 4
|
|
|
|
#define PFIT_HORIZ_SCALE_MASK 0x0000fff0
|
|
|
|
/* 965+ */
|
|
|
|
#define PFIT_VERT_SCALE_SHIFT_965 16
|
|
|
|
#define PFIT_VERT_SCALE_MASK_965 0x1fff0000
|
|
|
|
#define PFIT_HORIZ_SCALE_SHIFT_965 0
|
|
|
|
#define PFIT_HORIZ_SCALE_MASK_965 0x00001fff
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define PFIT_AUTO_RATIOS _MMIO(dev_priv->info.display_mmio_offset + 0x61238)
|
2008-07-29 18:54:06 +00:00
|
|
|
|
2014-02-07 19:12:48 +00:00
|
|
|
#define _VLV_BLC_PWM_CTL2_A (dev_priv->info.display_mmio_offset + 0x61250)
|
|
|
|
#define _VLV_BLC_PWM_CTL2_B (dev_priv->info.display_mmio_offset + 0x61350)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define VLV_BLC_PWM_CTL2(pipe) _MMIO_PIPE(pipe, _VLV_BLC_PWM_CTL2_A, \
|
|
|
|
_VLV_BLC_PWM_CTL2_B)
|
2013-10-31 16:55:50 +00:00
|
|
|
|
2014-02-07 19:12:48 +00:00
|
|
|
#define _VLV_BLC_PWM_CTL_A (dev_priv->info.display_mmio_offset + 0x61254)
|
|
|
|
#define _VLV_BLC_PWM_CTL_B (dev_priv->info.display_mmio_offset + 0x61354)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define VLV_BLC_PWM_CTL(pipe) _MMIO_PIPE(pipe, _VLV_BLC_PWM_CTL_A, \
|
|
|
|
_VLV_BLC_PWM_CTL_B)
|
2013-10-31 16:55:50 +00:00
|
|
|
|
2014-02-07 19:12:48 +00:00
|
|
|
#define _VLV_BLC_HIST_CTL_A (dev_priv->info.display_mmio_offset + 0x61260)
|
|
|
|
#define _VLV_BLC_HIST_CTL_B (dev_priv->info.display_mmio_offset + 0x61360)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define VLV_BLC_HIST_CTL(pipe) _MMIO_PIPE(pipe, _VLV_BLC_HIST_CTL_A, \
|
|
|
|
_VLV_BLC_HIST_CTL_B)
|
2013-10-31 16:55:50 +00:00
|
|
|
|
2008-07-29 18:54:06 +00:00
|
|
|
/* Backlight control */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define BLC_PWM_CTL2 _MMIO(dev_priv->info.display_mmio_offset + 0x61250) /* 965+ only */
|
2012-06-05 08:07:09 +00:00
|
|
|
#define BLM_PWM_ENABLE (1 << 31)
|
|
|
|
#define BLM_COMBINATION_MODE (1 << 30) /* gen4 only */
|
|
|
|
#define BLM_PIPE_SELECT (1 << 29)
|
|
|
|
#define BLM_PIPE_SELECT_IVB (3 << 29)
|
|
|
|
#define BLM_PIPE_A (0 << 29)
|
|
|
|
#define BLM_PIPE_B (1 << 29)
|
|
|
|
#define BLM_PIPE_C (2 << 29) /* ivb + */
|
2013-04-25 13:49:25 +00:00
|
|
|
#define BLM_TRANSCODER_A BLM_PIPE_A /* hsw */
|
|
|
|
#define BLM_TRANSCODER_B BLM_PIPE_B
|
|
|
|
#define BLM_TRANSCODER_C BLM_PIPE_C
|
|
|
|
#define BLM_TRANSCODER_EDP (3 << 29)
|
2012-06-05 08:07:09 +00:00
|
|
|
#define BLM_PIPE(pipe) ((pipe) << 29)
|
|
|
|
#define BLM_POLARITY_I965 (1 << 28) /* gen4 only */
|
|
|
|
#define BLM_PHASE_IN_INTERUPT_STATUS (1 << 26)
|
|
|
|
#define BLM_PHASE_IN_ENABLE (1 << 25)
|
|
|
|
#define BLM_PHASE_IN_INTERUPT_ENABL (1 << 24)
|
|
|
|
#define BLM_PHASE_IN_TIME_BASE_SHIFT (16)
|
|
|
|
#define BLM_PHASE_IN_TIME_BASE_MASK (0xff << 16)
|
|
|
|
#define BLM_PHASE_IN_COUNT_SHIFT (8)
|
|
|
|
#define BLM_PHASE_IN_COUNT_MASK (0xff << 8)
|
|
|
|
#define BLM_PHASE_IN_INCR_SHIFT (0)
|
|
|
|
#define BLM_PHASE_IN_INCR_MASK (0xff << 0)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define BLC_PWM_CTL _MMIO(dev_priv->info.display_mmio_offset + 0x61254)
|
2011-03-10 13:02:12 +00:00
|
|
|
/*
|
|
|
|
* This is the most significant 15 bits of the number of backlight cycles in a
|
|
|
|
* complete cycle of the modulated backlight control.
|
|
|
|
*
|
|
|
|
* The actual value is this field multiplied by two.
|
|
|
|
*/
|
2012-06-05 08:07:09 +00:00
|
|
|
#define BACKLIGHT_MODULATION_FREQ_SHIFT (17)
|
|
|
|
#define BACKLIGHT_MODULATION_FREQ_MASK (0x7fff << 17)
|
|
|
|
#define BLM_LEGACY_MODE (1 << 16) /* gen2 only */
|
2008-07-29 18:54:06 +00:00
|
|
|
/*
|
|
|
|
* This is the number of cycles out of the backlight modulation cycle for which
|
|
|
|
* the backlight is on.
|
|
|
|
*
|
|
|
|
* This field must be no greater than the number of cycles in the complete
|
|
|
|
* backlight modulation cycle.
|
|
|
|
*/
|
|
|
|
#define BACKLIGHT_DUTY_CYCLE_SHIFT (0)
|
|
|
|
#define BACKLIGHT_DUTY_CYCLE_MASK (0xffff)
|
2012-06-05 08:07:08 +00:00
|
|
|
#define BACKLIGHT_DUTY_CYCLE_MASK_PNV (0xfffe)
|
|
|
|
#define BLM_POLARITY_PNV (1 << 0) /* pnv only */
|
2008-07-29 18:54:06 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define BLC_HIST_CTL _MMIO(dev_priv->info.display_mmio_offset + 0x61260)
|
2015-06-26 11:18:56 +00:00
|
|
|
#define BLM_HISTOGRAM_ENABLE (1 << 31)
|
2009-10-14 19:33:41 +00:00
|
|
|
|
2012-06-05 08:07:09 +00:00
|
|
|
/* New registers for PCH-split platforms. Safe where new bits show up, the
|
|
|
|
* register layout machtes with gen4 BLC_PWM_CTL[12]. */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define BLC_PWM_CPU_CTL2 _MMIO(0x48250)
|
|
|
|
#define BLC_PWM_CPU_CTL _MMIO(0x48254)
|
2012-06-05 08:07:09 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define HSW_BLC_PWM2_CTL _MMIO(0x48350)
|
2013-07-23 14:19:26 +00:00
|
|
|
|
2012-06-05 08:07:09 +00:00
|
|
|
/* PCH CTL1 is totally different, all but the below bits are reserved. CTL2 is
|
|
|
|
* like the normal CTL from gen4 and earlier. Hooray for confusing naming. */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define BLC_PWM_PCH_CTL1 _MMIO(0xc8250)
|
2012-07-10 22:31:06 +00:00
|
|
|
#define BLM_PCH_PWM_ENABLE (1 << 31)
|
2012-06-05 08:07:09 +00:00
|
|
|
#define BLM_PCH_OVERRIDE_ENABLE (1 << 30)
|
|
|
|
#define BLM_PCH_POLARITY (1 << 29)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define BLC_PWM_PCH_CTL2 _MMIO(0xc8254)
|
2012-06-05 08:07:09 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define UTIL_PIN_CTL _MMIO(0x48400)
|
2013-07-23 14:19:26 +00:00
|
|
|
#define UTIL_PIN_ENABLE (1 << 31)
|
|
|
|
|
2015-09-30 17:04:57 +00:00
|
|
|
#define UTIL_PIN_PIPE(x) ((x) << 29)
|
|
|
|
#define UTIL_PIN_PIPE_MASK (3 << 29)
|
|
|
|
#define UTIL_PIN_MODE_PWM (1 << 24)
|
|
|
|
#define UTIL_PIN_MODE_MASK (0xf << 24)
|
|
|
|
#define UTIL_PIN_POLARITY (1 << 22)
|
|
|
|
|
2015-05-05 09:21:56 +00:00
|
|
|
/* BXT backlight register definition. */
|
2015-09-30 17:04:57 +00:00
|
|
|
#define _BXT_BLC_PWM_CTL1 0xC8250
|
2015-05-05 09:21:56 +00:00
|
|
|
#define BXT_BLC_PWM_ENABLE (1 << 31)
|
|
|
|
#define BXT_BLC_PWM_POLARITY (1 << 29)
|
2015-09-30 17:04:57 +00:00
|
|
|
#define _BXT_BLC_PWM_FREQ1 0xC8254
|
|
|
|
#define _BXT_BLC_PWM_DUTY1 0xC8258
|
|
|
|
|
|
|
|
#define _BXT_BLC_PWM_CTL2 0xC8350
|
|
|
|
#define _BXT_BLC_PWM_FREQ2 0xC8354
|
|
|
|
#define _BXT_BLC_PWM_DUTY2 0xC8358
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define BXT_BLC_PWM_CTL(controller) _MMIO_PIPE(controller, \
|
2015-09-30 17:04:57 +00:00
|
|
|
_BXT_BLC_PWM_CTL1, _BXT_BLC_PWM_CTL2)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define BXT_BLC_PWM_FREQ(controller) _MMIO_PIPE(controller, \
|
2015-09-30 17:04:57 +00:00
|
|
|
_BXT_BLC_PWM_FREQ1, _BXT_BLC_PWM_FREQ2)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define BXT_BLC_PWM_DUTY(controller) _MMIO_PIPE(controller, \
|
2015-09-30 17:04:57 +00:00
|
|
|
_BXT_BLC_PWM_DUTY1, _BXT_BLC_PWM_DUTY2)
|
2015-05-05 09:21:56 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define PCH_GTC_CTL _MMIO(0xe7000)
|
2013-07-23 14:19:26 +00:00
|
|
|
#define PCH_GTC_ENABLE (1 << 31)
|
|
|
|
|
2008-07-29 18:54:06 +00:00
|
|
|
/* TV port control */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define TV_CTL _MMIO(0x68000)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Enables the TV encoder */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_ENC_ENABLE (1 << 31)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Sources the TV encoder input from pipe B instead of A. */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_ENC_PIPEB_SELECT (1 << 30)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Outputs composite video (DAC A only) */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_ENC_OUTPUT_COMPOSITE (0 << 28)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Outputs SVideo video (DAC B/C) */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_ENC_OUTPUT_SVIDEO (1 << 28)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Outputs Component video (DAC A/B/C) */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_ENC_OUTPUT_COMPONENT (2 << 28)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Outputs Composite and SVideo (DAC A/B/C) */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_ENC_OUTPUT_SVIDEO_COMPOSITE (3 << 28)
|
|
|
|
# define TV_TRILEVEL_SYNC (1 << 21)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Enables slow sync generation (945GM only) */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_SLOW_SYNC (1 << 20)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Selects 4x oversampling for 480i and 576p */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_OVERSAMPLE_4X (0 << 18)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Selects 2x oversampling for 720p and 1080i */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_OVERSAMPLE_2X (1 << 18)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Selects no oversampling for 1080p */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_OVERSAMPLE_NONE (2 << 18)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Selects 8x oversampling */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_OVERSAMPLE_8X (3 << 18)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Selects progressive mode rather than interlaced */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_PROGRESSIVE (1 << 17)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Sets the colorburst to PAL mode. Required for non-M PAL modes. */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_PAL_BURST (1 << 16)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Field for setting delay of Y compared to C */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_YC_SKEW_MASK (7 << 12)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Enables a fix for 480p/576p standard definition modes on the 915GM only */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_ENC_SDP_FIX (1 << 11)
|
2014-04-25 17:14:30 +00:00
|
|
|
/*
|
2008-07-29 18:54:06 +00:00
|
|
|
* Enables a fix for the 915GM only.
|
|
|
|
*
|
|
|
|
* Not sure what it does.
|
|
|
|
*/
|
|
|
|
# define TV_ENC_C0_FIX (1 << 10)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Bits that must be preserved by software */
|
2009-03-04 11:36:02 +00:00
|
|
|
# define TV_CTL_SAVE ((1 << 11) | (3 << 9) | (7 << 6) | 0xf)
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_FUSE_STATE_MASK (3 << 4)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Read-only state that reports all features enabled */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_FUSE_STATE_ENABLED (0 << 4)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Read-only state that reports that Macrovision is disabled in hardware*/
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_FUSE_STATE_NO_MACROVISION (1 << 4)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Read-only state that reports that TV-out is disabled in hardware. */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_FUSE_STATE_DISABLED (2 << 4)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Normal operation */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_TEST_MODE_NORMAL (0 << 0)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Encoder test pattern 1 - combo pattern */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_TEST_MODE_PATTERN_1 (1 << 0)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Encoder test pattern 2 - full screen vertical 75% color bars */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_TEST_MODE_PATTERN_2 (2 << 0)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Encoder test pattern 3 - full screen horizontal 75% color bars */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_TEST_MODE_PATTERN_3 (3 << 0)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Encoder test pattern 4 - random noise */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_TEST_MODE_PATTERN_4 (4 << 0)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Encoder test pattern 5 - linear color ramps */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_TEST_MODE_PATTERN_5 (5 << 0)
|
2014-04-25 17:14:30 +00:00
|
|
|
/*
|
2008-07-29 18:54:06 +00:00
|
|
|
* This test mode forces the DACs to 50% of full output.
|
|
|
|
*
|
|
|
|
* This is used for load detection in combination with TVDAC_SENSE_MASK
|
|
|
|
*/
|
|
|
|
# define TV_TEST_MODE_MONITOR_DETECT (7 << 0)
|
|
|
|
# define TV_TEST_MODE_MASK (7 << 0)
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define TV_DAC _MMIO(0x68004)
|
2010-09-04 23:43:42 +00:00
|
|
|
# define TV_DAC_SAVE 0x00ffff00
|
2014-04-25 17:14:30 +00:00
|
|
|
/*
|
2008-07-29 18:54:06 +00:00
|
|
|
* Reports that DAC state change logic has reported change (RO).
|
|
|
|
*
|
|
|
|
* This gets cleared when TV_DAC_STATE_EN is cleared
|
|
|
|
*/
|
|
|
|
# define TVDAC_STATE_CHG (1 << 31)
|
|
|
|
# define TVDAC_SENSE_MASK (7 << 28)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Reports that DAC A voltage is above the detect threshold */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TVDAC_A_SENSE (1 << 30)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Reports that DAC B voltage is above the detect threshold */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TVDAC_B_SENSE (1 << 29)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Reports that DAC C voltage is above the detect threshold */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TVDAC_C_SENSE (1 << 28)
|
2014-04-25 17:14:30 +00:00
|
|
|
/*
|
2008-07-29 18:54:06 +00:00
|
|
|
* Enables DAC state detection logic, for load-based TV detection.
|
|
|
|
*
|
|
|
|
* The PLL of the chosen pipe (in TV_CTL) must be running, and the encoder set
|
|
|
|
* to off, for load detection to work.
|
|
|
|
*/
|
|
|
|
# define TVDAC_STATE_CHG_EN (1 << 27)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Sets the DAC A sense value to high */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TVDAC_A_SENSE_CTL (1 << 26)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Sets the DAC B sense value to high */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TVDAC_B_SENSE_CTL (1 << 25)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Sets the DAC C sense value to high */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TVDAC_C_SENSE_CTL (1 << 24)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Overrides the ENC_ENABLE and DAC voltage levels */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define DAC_CTL_OVERRIDE (1 << 7)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Sets the slew rate. Must be preserved in software */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define ENC_TVDAC_SLEW_FAST (1 << 6)
|
|
|
|
# define DAC_A_1_3_V (0 << 4)
|
|
|
|
# define DAC_A_1_1_V (1 << 4)
|
|
|
|
# define DAC_A_0_7_V (2 << 4)
|
2009-05-31 08:58:32 +00:00
|
|
|
# define DAC_A_MASK (3 << 4)
|
2008-07-29 18:54:06 +00:00
|
|
|
# define DAC_B_1_3_V (0 << 2)
|
|
|
|
# define DAC_B_1_1_V (1 << 2)
|
|
|
|
# define DAC_B_0_7_V (2 << 2)
|
2009-05-31 08:58:32 +00:00
|
|
|
# define DAC_B_MASK (3 << 2)
|
2008-07-29 18:54:06 +00:00
|
|
|
# define DAC_C_1_3_V (0 << 0)
|
|
|
|
# define DAC_C_1_1_V (1 << 0)
|
|
|
|
# define DAC_C_0_7_V (2 << 0)
|
2009-05-31 08:58:32 +00:00
|
|
|
# define DAC_C_MASK (3 << 0)
|
2008-07-29 18:54:06 +00:00
|
|
|
|
2014-04-25 17:14:30 +00:00
|
|
|
/*
|
2008-07-29 18:54:06 +00:00
|
|
|
* CSC coefficients are stored in a floating point format with 9 bits of
|
|
|
|
* mantissa and 2 or 3 bits of exponent. The exponent is represented as 2**-n,
|
|
|
|
* where 2-bit exponents are unsigned n, and 3-bit exponents are signed n with
|
|
|
|
* -1 (0x3) being the only legal negative value.
|
|
|
|
*/
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define TV_CSC_Y _MMIO(0x68010)
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_RY_MASK 0x07ff0000
|
|
|
|
# define TV_RY_SHIFT 16
|
|
|
|
# define TV_GY_MASK 0x00000fff
|
|
|
|
# define TV_GY_SHIFT 0
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define TV_CSC_Y2 _MMIO(0x68014)
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_BY_MASK 0x07ff0000
|
|
|
|
# define TV_BY_SHIFT 16
|
2014-04-25 17:14:30 +00:00
|
|
|
/*
|
2008-07-29 18:54:06 +00:00
|
|
|
* Y attenuation for component video.
|
|
|
|
*
|
|
|
|
* Stored in 1.9 fixed point.
|
|
|
|
*/
|
|
|
|
# define TV_AY_MASK 0x000003ff
|
|
|
|
# define TV_AY_SHIFT 0
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define TV_CSC_U _MMIO(0x68018)
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_RU_MASK 0x07ff0000
|
|
|
|
# define TV_RU_SHIFT 16
|
|
|
|
# define TV_GU_MASK 0x000007ff
|
|
|
|
# define TV_GU_SHIFT 0
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define TV_CSC_U2 _MMIO(0x6801c)
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_BU_MASK 0x07ff0000
|
|
|
|
# define TV_BU_SHIFT 16
|
2014-04-25 17:14:30 +00:00
|
|
|
/*
|
2008-07-29 18:54:06 +00:00
|
|
|
* U attenuation for component video.
|
|
|
|
*
|
|
|
|
* Stored in 1.9 fixed point.
|
|
|
|
*/
|
|
|
|
# define TV_AU_MASK 0x000003ff
|
|
|
|
# define TV_AU_SHIFT 0
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define TV_CSC_V _MMIO(0x68020)
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_RV_MASK 0x0fff0000
|
|
|
|
# define TV_RV_SHIFT 16
|
|
|
|
# define TV_GV_MASK 0x000007ff
|
|
|
|
# define TV_GV_SHIFT 0
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define TV_CSC_V2 _MMIO(0x68024)
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_BV_MASK 0x07ff0000
|
|
|
|
# define TV_BV_SHIFT 16
|
2014-04-25 17:14:30 +00:00
|
|
|
/*
|
2008-07-29 18:54:06 +00:00
|
|
|
* V attenuation for component video.
|
|
|
|
*
|
|
|
|
* Stored in 1.9 fixed point.
|
|
|
|
*/
|
|
|
|
# define TV_AV_MASK 0x000007ff
|
|
|
|
# define TV_AV_SHIFT 0
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define TV_CLR_KNOBS _MMIO(0x68028)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* 2s-complement brightness adjustment */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_BRIGHTNESS_MASK 0xff000000
|
|
|
|
# define TV_BRIGHTNESS_SHIFT 24
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Contrast adjustment, as a 2.6 unsigned floating point number */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_CONTRAST_MASK 0x00ff0000
|
|
|
|
# define TV_CONTRAST_SHIFT 16
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Saturation adjustment, as a 2.6 unsigned floating point number */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_SATURATION_MASK 0x0000ff00
|
|
|
|
# define TV_SATURATION_SHIFT 8
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Hue adjustment, as an integer phase angle in degrees */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_HUE_MASK 0x000000ff
|
|
|
|
# define TV_HUE_SHIFT 0
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define TV_CLR_LEVEL _MMIO(0x6802c)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Controls the DAC level for black */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_BLACK_LEVEL_MASK 0x01ff0000
|
|
|
|
# define TV_BLACK_LEVEL_SHIFT 16
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Controls the DAC level for blanking */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_BLANK_LEVEL_MASK 0x000001ff
|
|
|
|
# define TV_BLANK_LEVEL_SHIFT 0
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define TV_H_CTL_1 _MMIO(0x68030)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Number of pixels in the hsync. */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_HSYNC_END_MASK 0x1fff0000
|
|
|
|
# define TV_HSYNC_END_SHIFT 16
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Total number of pixels minus one in the line (display and blanking). */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_HTOTAL_MASK 0x00001fff
|
|
|
|
# define TV_HTOTAL_SHIFT 0
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define TV_H_CTL_2 _MMIO(0x68034)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Enables the colorburst (needed for non-component color) */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_BURST_ENA (1 << 31)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Offset of the colorburst from the start of hsync, in pixels minus one. */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_HBURST_START_SHIFT 16
|
|
|
|
# define TV_HBURST_START_MASK 0x1fff0000
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Length of the colorburst */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_HBURST_LEN_SHIFT 0
|
|
|
|
# define TV_HBURST_LEN_MASK 0x0001fff
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define TV_H_CTL_3 _MMIO(0x68038)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* End of hblank, measured in pixels minus one from start of hsync */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_HBLANK_END_SHIFT 16
|
|
|
|
# define TV_HBLANK_END_MASK 0x1fff0000
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Start of hblank, measured in pixels minus one from start of hsync */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_HBLANK_START_SHIFT 0
|
|
|
|
# define TV_HBLANK_START_MASK 0x0001fff
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define TV_V_CTL_1 _MMIO(0x6803c)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* XXX */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_NBR_END_SHIFT 16
|
|
|
|
# define TV_NBR_END_MASK 0x07ff0000
|
2014-04-25 17:14:30 +00:00
|
|
|
/* XXX */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_VI_END_F1_SHIFT 8
|
|
|
|
# define TV_VI_END_F1_MASK 0x00003f00
|
2014-04-25 17:14:30 +00:00
|
|
|
/* XXX */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_VI_END_F2_SHIFT 0
|
|
|
|
# define TV_VI_END_F2_MASK 0x0000003f
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define TV_V_CTL_2 _MMIO(0x68040)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Length of vsync, in half lines */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_VSYNC_LEN_MASK 0x07ff0000
|
|
|
|
# define TV_VSYNC_LEN_SHIFT 16
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Offset of the start of vsync in field 1, measured in one less than the
|
2008-07-29 18:54:06 +00:00
|
|
|
* number of half lines.
|
|
|
|
*/
|
|
|
|
# define TV_VSYNC_START_F1_MASK 0x00007f00
|
|
|
|
# define TV_VSYNC_START_F1_SHIFT 8
|
2014-04-25 17:14:30 +00:00
|
|
|
/*
|
2008-07-29 18:54:06 +00:00
|
|
|
* Offset of the start of vsync in field 2, measured in one less than the
|
|
|
|
* number of half lines.
|
|
|
|
*/
|
|
|
|
# define TV_VSYNC_START_F2_MASK 0x0000007f
|
|
|
|
# define TV_VSYNC_START_F2_SHIFT 0
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define TV_V_CTL_3 _MMIO(0x68044)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Enables generation of the equalization signal */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_EQUAL_ENA (1 << 31)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Length of vsync, in half lines */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_VEQ_LEN_MASK 0x007f0000
|
|
|
|
# define TV_VEQ_LEN_SHIFT 16
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Offset of the start of equalization in field 1, measured in one less than
|
2008-07-29 18:54:06 +00:00
|
|
|
* the number of half lines.
|
|
|
|
*/
|
|
|
|
# define TV_VEQ_START_F1_MASK 0x0007f00
|
|
|
|
# define TV_VEQ_START_F1_SHIFT 8
|
2014-04-25 17:14:30 +00:00
|
|
|
/*
|
2008-07-29 18:54:06 +00:00
|
|
|
* Offset of the start of equalization in field 2, measured in one less than
|
|
|
|
* the number of half lines.
|
|
|
|
*/
|
|
|
|
# define TV_VEQ_START_F2_MASK 0x000007f
|
|
|
|
# define TV_VEQ_START_F2_SHIFT 0
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define TV_V_CTL_4 _MMIO(0x68048)
|
2014-04-25 17:14:30 +00:00
|
|
|
/*
|
2008-07-29 18:54:06 +00:00
|
|
|
* Offset to start of vertical colorburst, measured in one less than the
|
|
|
|
* number of lines from vertical start.
|
|
|
|
*/
|
|
|
|
# define TV_VBURST_START_F1_MASK 0x003f0000
|
|
|
|
# define TV_VBURST_START_F1_SHIFT 16
|
2014-04-25 17:14:30 +00:00
|
|
|
/*
|
2008-07-29 18:54:06 +00:00
|
|
|
* Offset to the end of vertical colorburst, measured in one less than the
|
|
|
|
* number of lines from the start of NBR.
|
|
|
|
*/
|
|
|
|
# define TV_VBURST_END_F1_MASK 0x000000ff
|
|
|
|
# define TV_VBURST_END_F1_SHIFT 0
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define TV_V_CTL_5 _MMIO(0x6804c)
|
2014-04-25 17:14:30 +00:00
|
|
|
/*
|
2008-07-29 18:54:06 +00:00
|
|
|
* Offset to start of vertical colorburst, measured in one less than the
|
|
|
|
* number of lines from vertical start.
|
|
|
|
*/
|
|
|
|
# define TV_VBURST_START_F2_MASK 0x003f0000
|
|
|
|
# define TV_VBURST_START_F2_SHIFT 16
|
2014-04-25 17:14:30 +00:00
|
|
|
/*
|
2008-07-29 18:54:06 +00:00
|
|
|
* Offset to the end of vertical colorburst, measured in one less than the
|
|
|
|
* number of lines from the start of NBR.
|
|
|
|
*/
|
|
|
|
# define TV_VBURST_END_F2_MASK 0x000000ff
|
|
|
|
# define TV_VBURST_END_F2_SHIFT 0
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define TV_V_CTL_6 _MMIO(0x68050)
|
2014-04-25 17:14:30 +00:00
|
|
|
/*
|
2008-07-29 18:54:06 +00:00
|
|
|
* Offset to start of vertical colorburst, measured in one less than the
|
|
|
|
* number of lines from vertical start.
|
|
|
|
*/
|
|
|
|
# define TV_VBURST_START_F3_MASK 0x003f0000
|
|
|
|
# define TV_VBURST_START_F3_SHIFT 16
|
2014-04-25 17:14:30 +00:00
|
|
|
/*
|
2008-07-29 18:54:06 +00:00
|
|
|
* Offset to the end of vertical colorburst, measured in one less than the
|
|
|
|
* number of lines from the start of NBR.
|
|
|
|
*/
|
|
|
|
# define TV_VBURST_END_F3_MASK 0x000000ff
|
|
|
|
# define TV_VBURST_END_F3_SHIFT 0
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define TV_V_CTL_7 _MMIO(0x68054)
|
2014-04-25 17:14:30 +00:00
|
|
|
/*
|
2008-07-29 18:54:06 +00:00
|
|
|
* Offset to start of vertical colorburst, measured in one less than the
|
|
|
|
* number of lines from vertical start.
|
|
|
|
*/
|
|
|
|
# define TV_VBURST_START_F4_MASK 0x003f0000
|
|
|
|
# define TV_VBURST_START_F4_SHIFT 16
|
2014-04-25 17:14:30 +00:00
|
|
|
/*
|
2008-07-29 18:54:06 +00:00
|
|
|
* Offset to the end of vertical colorburst, measured in one less than the
|
|
|
|
* number of lines from the start of NBR.
|
|
|
|
*/
|
|
|
|
# define TV_VBURST_END_F4_MASK 0x000000ff
|
|
|
|
# define TV_VBURST_END_F4_SHIFT 0
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define TV_SC_CTL_1 _MMIO(0x68060)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Turns on the first subcarrier phase generation DDA */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_SC_DDA1_EN (1 << 31)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Turns on the first subcarrier phase generation DDA */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_SC_DDA2_EN (1 << 30)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Turns on the first subcarrier phase generation DDA */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_SC_DDA3_EN (1 << 29)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Sets the subcarrier DDA to reset frequency every other field */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_SC_RESET_EVERY_2 (0 << 24)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Sets the subcarrier DDA to reset frequency every fourth field */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_SC_RESET_EVERY_4 (1 << 24)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Sets the subcarrier DDA to reset frequency every eighth field */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_SC_RESET_EVERY_8 (2 << 24)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Sets the subcarrier DDA to never reset the frequency */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_SC_RESET_NEVER (3 << 24)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Sets the peak amplitude of the colorburst.*/
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_BURST_LEVEL_MASK 0x00ff0000
|
|
|
|
# define TV_BURST_LEVEL_SHIFT 16
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Sets the increment of the first subcarrier phase generation DDA */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_SCDDA1_INC_MASK 0x00000fff
|
|
|
|
# define TV_SCDDA1_INC_SHIFT 0
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define TV_SC_CTL_2 _MMIO(0x68064)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Sets the rollover for the second subcarrier phase generation DDA */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_SCDDA2_SIZE_MASK 0x7fff0000
|
|
|
|
# define TV_SCDDA2_SIZE_SHIFT 16
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Sets the increent of the second subcarrier phase generation DDA */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_SCDDA2_INC_MASK 0x00007fff
|
|
|
|
# define TV_SCDDA2_INC_SHIFT 0
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define TV_SC_CTL_3 _MMIO(0x68068)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Sets the rollover for the third subcarrier phase generation DDA */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_SCDDA3_SIZE_MASK 0x7fff0000
|
|
|
|
# define TV_SCDDA3_SIZE_SHIFT 16
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Sets the increent of the third subcarrier phase generation DDA */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_SCDDA3_INC_MASK 0x00007fff
|
|
|
|
# define TV_SCDDA3_INC_SHIFT 0
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define TV_WIN_POS _MMIO(0x68070)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* X coordinate of the display from the start of horizontal active */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_XPOS_MASK 0x1fff0000
|
|
|
|
# define TV_XPOS_SHIFT 16
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Y coordinate of the display from the start of vertical active (NBR) */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_YPOS_MASK 0x00000fff
|
|
|
|
# define TV_YPOS_SHIFT 0
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define TV_WIN_SIZE _MMIO(0x68074)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Horizontal size of the display window, measured in pixels*/
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_XSIZE_MASK 0x1fff0000
|
|
|
|
# define TV_XSIZE_SHIFT 16
|
2014-04-25 17:14:30 +00:00
|
|
|
/*
|
2008-07-29 18:54:06 +00:00
|
|
|
* Vertical size of the display window, measured in pixels.
|
|
|
|
*
|
|
|
|
* Must be even for interlaced modes.
|
|
|
|
*/
|
|
|
|
# define TV_YSIZE_MASK 0x00000fff
|
|
|
|
# define TV_YSIZE_SHIFT 0
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define TV_FILTER_CTL_1 _MMIO(0x68080)
|
2014-04-25 17:14:30 +00:00
|
|
|
/*
|
2008-07-29 18:54:06 +00:00
|
|
|
* Enables automatic scaling calculation.
|
|
|
|
*
|
|
|
|
* If set, the rest of the registers are ignored, and the calculated values can
|
|
|
|
* be read back from the register.
|
|
|
|
*/
|
|
|
|
# define TV_AUTO_SCALE (1 << 31)
|
2014-04-25 17:14:30 +00:00
|
|
|
/*
|
2008-07-29 18:54:06 +00:00
|
|
|
* Disables the vertical filter.
|
|
|
|
*
|
|
|
|
* This is required on modes more than 1024 pixels wide */
|
|
|
|
# define TV_V_FILTER_BYPASS (1 << 29)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Enables adaptive vertical filtering */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_VADAPT (1 << 28)
|
|
|
|
# define TV_VADAPT_MODE_MASK (3 << 26)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Selects the least adaptive vertical filtering mode */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_VADAPT_MODE_LEAST (0 << 26)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Selects the moderately adaptive vertical filtering mode */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_VADAPT_MODE_MODERATE (1 << 26)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Selects the most adaptive vertical filtering mode */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_VADAPT_MODE_MOST (3 << 26)
|
2014-04-25 17:14:30 +00:00
|
|
|
/*
|
2008-07-29 18:54:06 +00:00
|
|
|
* Sets the horizontal scaling factor.
|
|
|
|
*
|
|
|
|
* This should be the fractional part of the horizontal scaling factor divided
|
|
|
|
* by the oversampling rate. TV_HSCALE should be less than 1, and set to:
|
|
|
|
*
|
|
|
|
* (src width - 1) / ((oversample * dest width) - 1)
|
|
|
|
*/
|
|
|
|
# define TV_HSCALE_FRAC_MASK 0x00003fff
|
|
|
|
# define TV_HSCALE_FRAC_SHIFT 0
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define TV_FILTER_CTL_2 _MMIO(0x68084)
|
2014-04-25 17:14:30 +00:00
|
|
|
/*
|
2008-07-29 18:54:06 +00:00
|
|
|
* Sets the integer part of the 3.15 fixed-point vertical scaling factor.
|
|
|
|
*
|
|
|
|
* TV_VSCALE should be (src height - 1) / ((interlace * dest height) - 1)
|
|
|
|
*/
|
|
|
|
# define TV_VSCALE_INT_MASK 0x00038000
|
|
|
|
# define TV_VSCALE_INT_SHIFT 15
|
2014-04-25 17:14:30 +00:00
|
|
|
/*
|
2008-07-29 18:54:06 +00:00
|
|
|
* Sets the fractional part of the 3.15 fixed-point vertical scaling factor.
|
|
|
|
*
|
|
|
|
* \sa TV_VSCALE_INT_MASK
|
|
|
|
*/
|
|
|
|
# define TV_VSCALE_FRAC_MASK 0x00007fff
|
|
|
|
# define TV_VSCALE_FRAC_SHIFT 0
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define TV_FILTER_CTL_3 _MMIO(0x68088)
|
2014-04-25 17:14:30 +00:00
|
|
|
/*
|
2008-07-29 18:54:06 +00:00
|
|
|
* Sets the integer part of the 3.15 fixed-point vertical scaling factor.
|
|
|
|
*
|
|
|
|
* TV_VSCALE should be (src height - 1) / (1/4 * (dest height - 1))
|
|
|
|
*
|
|
|
|
* For progressive modes, TV_VSCALE_IP_INT should be set to zeroes.
|
|
|
|
*/
|
|
|
|
# define TV_VSCALE_IP_INT_MASK 0x00038000
|
|
|
|
# define TV_VSCALE_IP_INT_SHIFT 15
|
2014-04-25 17:14:30 +00:00
|
|
|
/*
|
2008-07-29 18:54:06 +00:00
|
|
|
* Sets the fractional part of the 3.15 fixed-point vertical scaling factor.
|
|
|
|
*
|
|
|
|
* For progressive modes, TV_VSCALE_IP_INT should be set to zeroes.
|
|
|
|
*
|
|
|
|
* \sa TV_VSCALE_IP_INT_MASK
|
|
|
|
*/
|
|
|
|
# define TV_VSCALE_IP_FRAC_MASK 0x00007fff
|
|
|
|
# define TV_VSCALE_IP_FRAC_SHIFT 0
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define TV_CC_CONTROL _MMIO(0x68090)
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_CC_ENABLE (1 << 31)
|
2014-04-25 17:14:30 +00:00
|
|
|
/*
|
2008-07-29 18:54:06 +00:00
|
|
|
* Specifies which field to send the CC data in.
|
|
|
|
*
|
|
|
|
* CC data is usually sent in field 0.
|
|
|
|
*/
|
|
|
|
# define TV_CC_FID_MASK (1 << 27)
|
|
|
|
# define TV_CC_FID_SHIFT 27
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Sets the horizontal position of the CC data. Usually 135. */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_CC_HOFF_MASK 0x03ff0000
|
|
|
|
# define TV_CC_HOFF_SHIFT 16
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Sets the vertical position of the CC data. Usually 21 */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_CC_LINE_MASK 0x0000003f
|
|
|
|
# define TV_CC_LINE_SHIFT 0
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define TV_CC_DATA _MMIO(0x68094)
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_CC_RDY (1 << 31)
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Second word of CC data to be transmitted. */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_CC_DATA_2_MASK 0x007f0000
|
|
|
|
# define TV_CC_DATA_2_SHIFT 16
|
2014-04-25 17:14:30 +00:00
|
|
|
/* First word of CC data to be transmitted. */
|
2008-07-29 18:54:06 +00:00
|
|
|
# define TV_CC_DATA_1_MASK 0x0000007f
|
|
|
|
# define TV_CC_DATA_1_SHIFT 0
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define TV_H_LUMA(i) _MMIO(0x68100 + (i) * 4) /* 60 registers */
|
|
|
|
#define TV_H_CHROMA(i) _MMIO(0x68200 + (i) * 4) /* 60 registers */
|
|
|
|
#define TV_V_LUMA(i) _MMIO(0x68300 + (i) * 4) /* 43 registers */
|
|
|
|
#define TV_V_CHROMA(i) _MMIO(0x68400 + (i) * 4) /* 43 registers */
|
2008-07-29 18:54:06 +00:00
|
|
|
|
2009-05-31 03:42:33 +00:00
|
|
|
/* Display Port */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define DP_A _MMIO(0x64000) /* eDP */
|
|
|
|
#define DP_B _MMIO(0x64100)
|
|
|
|
#define DP_C _MMIO(0x64200)
|
|
|
|
#define DP_D _MMIO(0x64300)
|
2009-05-31 03:42:33 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define VLV_DP_B _MMIO(VLV_DISPLAY_BASE + 0x64100)
|
|
|
|
#define VLV_DP_C _MMIO(VLV_DISPLAY_BASE + 0x64200)
|
|
|
|
#define CHV_DP_D _MMIO(VLV_DISPLAY_BASE + 0x64300)
|
2015-09-18 17:03:34 +00:00
|
|
|
|
2009-05-31 03:42:33 +00:00
|
|
|
#define DP_PORT_EN (1 << 31)
|
|
|
|
#define DP_PIPEB_SELECT (1 << 30)
|
2011-02-07 21:46:40 +00:00
|
|
|
#define DP_PIPE_MASK (1 << 30)
|
2014-04-09 10:28:21 +00:00
|
|
|
#define DP_PIPE_SELECT_CHV(pipe) ((pipe) << 16)
|
|
|
|
#define DP_PIPE_MASK_CHV (3 << 16)
|
2011-02-07 21:46:40 +00:00
|
|
|
|
2009-05-31 03:42:33 +00:00
|
|
|
/* Link training mode - select a suitable mode for each stage */
|
|
|
|
#define DP_LINK_TRAIN_PAT_1 (0 << 28)
|
|
|
|
#define DP_LINK_TRAIN_PAT_2 (1 << 28)
|
|
|
|
#define DP_LINK_TRAIN_PAT_IDLE (2 << 28)
|
|
|
|
#define DP_LINK_TRAIN_OFF (3 << 28)
|
|
|
|
#define DP_LINK_TRAIN_MASK (3 << 28)
|
|
|
|
#define DP_LINK_TRAIN_SHIFT 28
|
2014-06-27 23:04:25 +00:00
|
|
|
#define DP_LINK_TRAIN_PAT_3_CHV (1 << 14)
|
|
|
|
#define DP_LINK_TRAIN_MASK_CHV ((3 << 28)|(1<<14))
|
2009-05-31 03:42:33 +00:00
|
|
|
|
2010-04-07 08:15:54 +00:00
|
|
|
/* CPT Link training mode */
|
|
|
|
#define DP_LINK_TRAIN_PAT_1_CPT (0 << 8)
|
|
|
|
#define DP_LINK_TRAIN_PAT_2_CPT (1 << 8)
|
|
|
|
#define DP_LINK_TRAIN_PAT_IDLE_CPT (2 << 8)
|
|
|
|
#define DP_LINK_TRAIN_OFF_CPT (3 << 8)
|
|
|
|
#define DP_LINK_TRAIN_MASK_CPT (7 << 8)
|
|
|
|
#define DP_LINK_TRAIN_SHIFT_CPT 8
|
|
|
|
|
2009-05-31 03:42:33 +00:00
|
|
|
/* Signal voltages. These are mostly controlled by the other end */
|
|
|
|
#define DP_VOLTAGE_0_4 (0 << 25)
|
|
|
|
#define DP_VOLTAGE_0_6 (1 << 25)
|
|
|
|
#define DP_VOLTAGE_0_8 (2 << 25)
|
|
|
|
#define DP_VOLTAGE_1_2 (3 << 25)
|
|
|
|
#define DP_VOLTAGE_MASK (7 << 25)
|
|
|
|
#define DP_VOLTAGE_SHIFT 25
|
|
|
|
|
|
|
|
/* Signal pre-emphasis levels, like voltages, the other end tells us what
|
|
|
|
* they want
|
|
|
|
*/
|
|
|
|
#define DP_PRE_EMPHASIS_0 (0 << 22)
|
|
|
|
#define DP_PRE_EMPHASIS_3_5 (1 << 22)
|
|
|
|
#define DP_PRE_EMPHASIS_6 (2 << 22)
|
|
|
|
#define DP_PRE_EMPHASIS_9_5 (3 << 22)
|
|
|
|
#define DP_PRE_EMPHASIS_MASK (7 << 22)
|
|
|
|
#define DP_PRE_EMPHASIS_SHIFT 22
|
|
|
|
|
|
|
|
/* How many wires to use. I guess 3 was too hard */
|
2013-04-30 12:01:40 +00:00
|
|
|
#define DP_PORT_WIDTH(width) (((width) - 1) << 19)
|
2009-05-31 03:42:33 +00:00
|
|
|
#define DP_PORT_WIDTH_MASK (7 << 19)
|
2015-07-06 13:39:15 +00:00
|
|
|
#define DP_PORT_WIDTH_SHIFT 19
|
2009-05-31 03:42:33 +00:00
|
|
|
|
|
|
|
/* Mystic DPCD version 1.1 special mode */
|
|
|
|
#define DP_ENHANCED_FRAMING (1 << 18)
|
|
|
|
|
2009-07-23 17:00:32 +00:00
|
|
|
/* eDP */
|
|
|
|
#define DP_PLL_FREQ_270MHZ (0 << 16)
|
2015-10-29 19:25:59 +00:00
|
|
|
#define DP_PLL_FREQ_162MHZ (1 << 16)
|
2009-07-23 17:00:32 +00:00
|
|
|
#define DP_PLL_FREQ_MASK (3 << 16)
|
|
|
|
|
2014-04-25 17:14:30 +00:00
|
|
|
/* locked once port is enabled */
|
2009-05-31 03:42:33 +00:00
|
|
|
#define DP_PORT_REVERSAL (1 << 15)
|
|
|
|
|
2009-07-23 17:00:32 +00:00
|
|
|
/* eDP */
|
|
|
|
#define DP_PLL_ENABLE (1 << 14)
|
|
|
|
|
2014-04-25 17:14:30 +00:00
|
|
|
/* sends the clock on lane 15 of the PEG for debug */
|
2009-05-31 03:42:33 +00:00
|
|
|
#define DP_CLOCK_OUTPUT_ENABLE (1 << 13)
|
|
|
|
|
|
|
|
#define DP_SCRAMBLING_DISABLE (1 << 12)
|
2009-12-03 22:14:42 +00:00
|
|
|
#define DP_SCRAMBLING_DISABLE_IRONLAKE (1 << 7)
|
2009-05-31 03:42:33 +00:00
|
|
|
|
2014-04-25 17:14:30 +00:00
|
|
|
/* limit RGB values to avoid confusing TVs */
|
2009-05-31 03:42:33 +00:00
|
|
|
#define DP_COLOR_RANGE_16_235 (1 << 8)
|
|
|
|
|
2014-04-25 17:14:30 +00:00
|
|
|
/* Turn on the audio link */
|
2009-05-31 03:42:33 +00:00
|
|
|
#define DP_AUDIO_OUTPUT_ENABLE (1 << 6)
|
|
|
|
|
2014-04-25 17:14:30 +00:00
|
|
|
/* vs and hs sync polarity */
|
2009-05-31 03:42:33 +00:00
|
|
|
#define DP_SYNC_VS_HIGH (1 << 4)
|
|
|
|
#define DP_SYNC_HS_HIGH (1 << 3)
|
|
|
|
|
2014-04-25 17:14:30 +00:00
|
|
|
/* A fantasy */
|
2009-05-31 03:42:33 +00:00
|
|
|
#define DP_DETECTED (1 << 2)
|
|
|
|
|
2014-04-25 17:14:30 +00:00
|
|
|
/* The aux channel provides a way to talk to the
|
2009-05-31 03:42:33 +00:00
|
|
|
* signal sink for DDC etc. Max packet size supported
|
|
|
|
* is 20 bytes in each direction, hence the 5 fixed
|
|
|
|
* data registers
|
|
|
|
*/
|
2015-11-11 18:34:13 +00:00
|
|
|
#define _DPA_AUX_CH_CTL (dev_priv->info.display_mmio_offset + 0x64010)
|
|
|
|
#define _DPA_AUX_CH_DATA1 (dev_priv->info.display_mmio_offset + 0x64014)
|
|
|
|
#define _DPA_AUX_CH_DATA2 (dev_priv->info.display_mmio_offset + 0x64018)
|
|
|
|
#define _DPA_AUX_CH_DATA3 (dev_priv->info.display_mmio_offset + 0x6401c)
|
|
|
|
#define _DPA_AUX_CH_DATA4 (dev_priv->info.display_mmio_offset + 0x64020)
|
|
|
|
#define _DPA_AUX_CH_DATA5 (dev_priv->info.display_mmio_offset + 0x64024)
|
|
|
|
|
|
|
|
#define _DPB_AUX_CH_CTL (dev_priv->info.display_mmio_offset + 0x64110)
|
|
|
|
#define _DPB_AUX_CH_DATA1 (dev_priv->info.display_mmio_offset + 0x64114)
|
|
|
|
#define _DPB_AUX_CH_DATA2 (dev_priv->info.display_mmio_offset + 0x64118)
|
|
|
|
#define _DPB_AUX_CH_DATA3 (dev_priv->info.display_mmio_offset + 0x6411c)
|
|
|
|
#define _DPB_AUX_CH_DATA4 (dev_priv->info.display_mmio_offset + 0x64120)
|
|
|
|
#define _DPB_AUX_CH_DATA5 (dev_priv->info.display_mmio_offset + 0x64124)
|
|
|
|
|
|
|
|
#define _DPC_AUX_CH_CTL (dev_priv->info.display_mmio_offset + 0x64210)
|
|
|
|
#define _DPC_AUX_CH_DATA1 (dev_priv->info.display_mmio_offset + 0x64214)
|
|
|
|
#define _DPC_AUX_CH_DATA2 (dev_priv->info.display_mmio_offset + 0x64218)
|
|
|
|
#define _DPC_AUX_CH_DATA3 (dev_priv->info.display_mmio_offset + 0x6421c)
|
|
|
|
#define _DPC_AUX_CH_DATA4 (dev_priv->info.display_mmio_offset + 0x64220)
|
|
|
|
#define _DPC_AUX_CH_DATA5 (dev_priv->info.display_mmio_offset + 0x64224)
|
|
|
|
|
|
|
|
#define _DPD_AUX_CH_CTL (dev_priv->info.display_mmio_offset + 0x64310)
|
|
|
|
#define _DPD_AUX_CH_DATA1 (dev_priv->info.display_mmio_offset + 0x64314)
|
|
|
|
#define _DPD_AUX_CH_DATA2 (dev_priv->info.display_mmio_offset + 0x64318)
|
|
|
|
#define _DPD_AUX_CH_DATA3 (dev_priv->info.display_mmio_offset + 0x6431c)
|
|
|
|
#define _DPD_AUX_CH_DATA4 (dev_priv->info.display_mmio_offset + 0x64320)
|
|
|
|
#define _DPD_AUX_CH_DATA5 (dev_priv->info.display_mmio_offset + 0x64324)
|
2015-11-11 18:34:12 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define DP_AUX_CH_CTL(port) _MMIO_PORT(port, _DPA_AUX_CH_CTL, _DPB_AUX_CH_CTL)
|
|
|
|
#define DP_AUX_CH_DATA(port, i) _MMIO(_PORT(port, _DPA_AUX_CH_DATA1, _DPB_AUX_CH_DATA1) + (i) * 4) /* 5 registers */
|
2009-05-31 03:42:33 +00:00
|
|
|
|
|
|
|
#define DP_AUX_CH_CTL_SEND_BUSY (1 << 31)
|
|
|
|
#define DP_AUX_CH_CTL_DONE (1 << 30)
|
|
|
|
#define DP_AUX_CH_CTL_INTERRUPT (1 << 29)
|
|
|
|
#define DP_AUX_CH_CTL_TIME_OUT_ERROR (1 << 28)
|
|
|
|
#define DP_AUX_CH_CTL_TIME_OUT_400us (0 << 26)
|
|
|
|
#define DP_AUX_CH_CTL_TIME_OUT_600us (1 << 26)
|
|
|
|
#define DP_AUX_CH_CTL_TIME_OUT_800us (2 << 26)
|
|
|
|
#define DP_AUX_CH_CTL_TIME_OUT_1600us (3 << 26)
|
|
|
|
#define DP_AUX_CH_CTL_TIME_OUT_MASK (3 << 26)
|
|
|
|
#define DP_AUX_CH_CTL_RECEIVE_ERROR (1 << 25)
|
|
|
|
#define DP_AUX_CH_CTL_MESSAGE_SIZE_MASK (0x1f << 20)
|
|
|
|
#define DP_AUX_CH_CTL_MESSAGE_SIZE_SHIFT 20
|
|
|
|
#define DP_AUX_CH_CTL_PRECHARGE_2US_MASK (0xf << 16)
|
|
|
|
#define DP_AUX_CH_CTL_PRECHARGE_2US_SHIFT 16
|
|
|
|
#define DP_AUX_CH_CTL_AUX_AKSV_SELECT (1 << 15)
|
|
|
|
#define DP_AUX_CH_CTL_MANCHESTER_TEST (1 << 14)
|
|
|
|
#define DP_AUX_CH_CTL_SYNC_TEST (1 << 13)
|
|
|
|
#define DP_AUX_CH_CTL_DEGLITCH_TEST (1 << 12)
|
|
|
|
#define DP_AUX_CH_CTL_PRECHARGE_TEST (1 << 11)
|
|
|
|
#define DP_AUX_CH_CTL_BIT_CLOCK_2X_MASK (0x7ff)
|
|
|
|
#define DP_AUX_CH_CTL_BIT_CLOCK_2X_SHIFT 0
|
2015-01-22 09:00:54 +00:00
|
|
|
#define DP_AUX_CH_CTL_PSR_DATA_AUX_REG_SKL (1 << 14)
|
|
|
|
#define DP_AUX_CH_CTL_FS_DATA_AUX_REG_SKL (1 << 13)
|
|
|
|
#define DP_AUX_CH_CTL_GTC_DATA_AUX_REG_SKL (1 << 12)
|
2015-09-18 17:03:40 +00:00
|
|
|
#define DP_AUX_CH_CTL_FW_SYNC_PULSE_SKL_MASK (0x1f << 5)
|
2015-01-22 09:00:54 +00:00
|
|
|
#define DP_AUX_CH_CTL_FW_SYNC_PULSE_SKL(c) (((c) - 1) << 5)
|
2014-01-20 16:01:00 +00:00
|
|
|
#define DP_AUX_CH_CTL_SYNC_PULSE_SKL(c) ((c) - 1)
|
2009-05-31 03:42:33 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Computing GMCH M and N values for the Display Port link
|
|
|
|
*
|
|
|
|
* GMCH M/N = dot clock * bytes per pixel / ls_clk * # of lanes
|
|
|
|
*
|
|
|
|
* ls_clk (we assume) is the DP link clock (1.62 or 2.7 GHz)
|
|
|
|
*
|
|
|
|
* The GMCH value is used internally
|
|
|
|
*
|
|
|
|
* bytes_per_pixel is the number of bytes coming out of the plane,
|
|
|
|
* which is after the LUTs, so we want the bytes for our color format.
|
|
|
|
* For our current usage, this is always 3, one byte for R, G and B.
|
|
|
|
*/
|
2013-05-03 09:49:49 +00:00
|
|
|
#define _PIPEA_DATA_M_G4X 0x70050
|
|
|
|
#define _PIPEB_DATA_M_G4X 0x71050
|
2009-05-31 03:42:33 +00:00
|
|
|
|
|
|
|
/* Transfer unit size for display port - 1, default is 0x3f (for TU size 64) */
|
2013-04-23 12:03:34 +00:00
|
|
|
#define TU_SIZE(x) (((x)-1) << 25) /* default size 64 */
|
2013-04-04 11:28:53 +00:00
|
|
|
#define TU_SIZE_SHIFT 25
|
2013-04-23 12:03:34 +00:00
|
|
|
#define TU_SIZE_MASK (0x3f << 25)
|
2009-05-31 03:42:33 +00:00
|
|
|
|
2013-04-23 12:03:34 +00:00
|
|
|
#define DATA_LINK_M_N_MASK (0xffffff)
|
|
|
|
#define DATA_LINK_N_MAX (0x800000)
|
2009-05-31 03:42:33 +00:00
|
|
|
|
2013-05-03 09:49:49 +00:00
|
|
|
#define _PIPEA_DATA_N_G4X 0x70054
|
|
|
|
#define _PIPEB_DATA_N_G4X 0x71054
|
2009-05-31 03:42:33 +00:00
|
|
|
#define PIPE_GMCH_DATA_N_MASK (0xffffff)
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Computing Link M and N values for the Display Port link
|
|
|
|
*
|
|
|
|
* Link M / N = pixel_clock / ls_clk
|
|
|
|
*
|
|
|
|
* (the DP spec calls pixel_clock the 'strm_clk')
|
|
|
|
*
|
|
|
|
* The Link value is transmitted in the Main Stream
|
|
|
|
* Attributes and VB-ID.
|
|
|
|
*/
|
|
|
|
|
2013-05-03 09:49:49 +00:00
|
|
|
#define _PIPEA_LINK_M_G4X 0x70060
|
|
|
|
#define _PIPEB_LINK_M_G4X 0x71060
|
2009-05-31 03:42:33 +00:00
|
|
|
#define PIPEA_DP_LINK_M_MASK (0xffffff)
|
|
|
|
|
2013-05-03 09:49:49 +00:00
|
|
|
#define _PIPEA_LINK_N_G4X 0x70064
|
|
|
|
#define _PIPEB_LINK_N_G4X 0x71064
|
2009-05-31 03:42:33 +00:00
|
|
|
#define PIPEA_DP_LINK_N_MASK (0xffffff)
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define PIPE_DATA_M_G4X(pipe) _MMIO_PIPE(pipe, _PIPEA_DATA_M_G4X, _PIPEB_DATA_M_G4X)
|
|
|
|
#define PIPE_DATA_N_G4X(pipe) _MMIO_PIPE(pipe, _PIPEA_DATA_N_G4X, _PIPEB_DATA_N_G4X)
|
|
|
|
#define PIPE_LINK_M_G4X(pipe) _MMIO_PIPE(pipe, _PIPEA_LINK_M_G4X, _PIPEB_LINK_M_G4X)
|
|
|
|
#define PIPE_LINK_N_G4X(pipe) _MMIO_PIPE(pipe, _PIPEA_LINK_N_G4X, _PIPEB_LINK_N_G4X)
|
2011-02-07 20:26:52 +00:00
|
|
|
|
2008-07-29 18:54:06 +00:00
|
|
|
/* Display & cursor control */
|
|
|
|
|
|
|
|
/* Pipe A */
|
drm/i915: Reorganize display pipe register accesses
RFCv2: Reorganize array indexing so that full offsets can be used as
is. It makes grepping for registers in i915_reg.h much easier. Also
move offset arrays to intel_device_info.
v1: Fixed offsets for VLV, proper eDP handling
v2: Fixed BCLRPAT, PIPESRC, PIPECONF and DSP* macros.
v3: Added EDP pipe comment, removed redundant offset arrays for
MSA_MISC and DDI_FUNC_CTL.
v4: Rename patch and report object size increase.
v5: Change location of commas, add PIPE_EDP into enum pipe
v6: Insert PIPE_EDP_OFFSET into pipe offset array
v7: Set I915_MAX_PIPES back to 3, change more registers accessors
to use the new macros, get rid of _PIPE_INC and add dev_priv
as a parameter where required by the new macros.
Upcoming hardware will not have the various display pipe register
ranges evenly spaced in memory. Change register address calculations
into array lookups.
Tested on SNB, VLV, IVB, Gen2 and HSW w/eDP.
I left the UMS cruft untouched.
Size differences:
text data bss dec hex filename
596431 4634 56 601121 92c21 i915.ko (new)
593199 4634 56 597889 91f81 i915.ko (old)
Signed-off-by: Antti Koskipaa <antti.koskipaa@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Tested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-02-04 12:22:24 +00:00
|
|
|
#define _PIPEADSL 0x70000
|
2012-05-04 20:18:14 +00:00
|
|
|
#define DSL_LINEMASK_GEN2 0x00000fff
|
|
|
|
#define DSL_LINEMASK_GEN3 0x00001fff
|
drm/i915: Reorganize display pipe register accesses
RFCv2: Reorganize array indexing so that full offsets can be used as
is. It makes grepping for registers in i915_reg.h much easier. Also
move offset arrays to intel_device_info.
v1: Fixed offsets for VLV, proper eDP handling
v2: Fixed BCLRPAT, PIPESRC, PIPECONF and DSP* macros.
v3: Added EDP pipe comment, removed redundant offset arrays for
MSA_MISC and DDI_FUNC_CTL.
v4: Rename patch and report object size increase.
v5: Change location of commas, add PIPE_EDP into enum pipe
v6: Insert PIPE_EDP_OFFSET into pipe offset array
v7: Set I915_MAX_PIPES back to 3, change more registers accessors
to use the new macros, get rid of _PIPE_INC and add dev_priv
as a parameter where required by the new macros.
Upcoming hardware will not have the various display pipe register
ranges evenly spaced in memory. Change register address calculations
into array lookups.
Tested on SNB, VLV, IVB, Gen2 and HSW w/eDP.
I left the UMS cruft untouched.
Size differences:
text data bss dec hex filename
596431 4634 56 601121 92c21 i915.ko (new)
593199 4634 56 597889 91f81 i915.ko (old)
Signed-off-by: Antti Koskipaa <antti.koskipaa@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Tested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-02-04 12:22:24 +00:00
|
|
|
#define _PIPEACONF 0x70008
|
2010-09-11 12:48:45 +00:00
|
|
|
#define PIPECONF_ENABLE (1<<31)
|
|
|
|
#define PIPECONF_DISABLE 0
|
|
|
|
#define PIPECONF_DOUBLE_WIDE (1<<30)
|
2008-07-29 18:54:06 +00:00
|
|
|
#define I965_PIPECONF_ACTIVE (1<<30)
|
2013-08-27 12:12:15 +00:00
|
|
|
#define PIPECONF_DSI_PLL_LOCKED (1<<29) /* vlv & pipe A only */
|
2012-03-22 15:00:50 +00:00
|
|
|
#define PIPECONF_FRAME_START_DELAY_MASK (3<<27)
|
2010-09-11 12:48:45 +00:00
|
|
|
#define PIPECONF_SINGLE_WIDE 0
|
|
|
|
#define PIPECONF_PIPE_UNLOCKED 0
|
|
|
|
#define PIPECONF_PIPE_LOCKED (1<<25)
|
|
|
|
#define PIPECONF_PALETTE 0
|
|
|
|
#define PIPECONF_GAMMA (1<<24)
|
2008-07-29 18:54:06 +00:00
|
|
|
#define PIPECONF_FORCE_BORDER (1<<25)
|
2011-12-19 19:03:33 +00:00
|
|
|
#define PIPECONF_INTERLACE_MASK (7 << 21)
|
2012-10-05 15:05:57 +00:00
|
|
|
#define PIPECONF_INTERLACE_MASK_HSW (3 << 21)
|
2012-01-28 13:49:19 +00:00
|
|
|
/* Note that pre-gen3 does not support interlaced display directly. Panel
|
|
|
|
* fitting must be disabled on pre-ilk for interlaced. */
|
|
|
|
#define PIPECONF_PROGRESSIVE (0 << 21)
|
|
|
|
#define PIPECONF_INTERLACE_W_SYNC_SHIFT_PANEL (4 << 21) /* gen4 only */
|
|
|
|
#define PIPECONF_INTERLACE_W_SYNC_SHIFT (5 << 21) /* gen4 only */
|
|
|
|
#define PIPECONF_INTERLACE_W_FIELD_INDICATION (6 << 21)
|
|
|
|
#define PIPECONF_INTERLACE_FIELD_0_ONLY (7 << 21) /* gen3 only */
|
|
|
|
/* Ironlake and later have a complete new set of values for interlaced. PFIT
|
|
|
|
* means panel fitter required, PF means progressive fetch, DBL means power
|
|
|
|
* saving pixel doubling. */
|
|
|
|
#define PIPECONF_PFIT_PF_INTERLACED_ILK (1 << 21)
|
|
|
|
#define PIPECONF_INTERLACED_ILK (3 << 21)
|
|
|
|
#define PIPECONF_INTERLACED_DBL_ILK (4 << 21) /* ilk/snb only */
|
|
|
|
#define PIPECONF_PFIT_PF_INTERLACED_DBL_ILK (5 << 21) /* ilk/snb only */
|
2013-04-29 19:56:12 +00:00
|
|
|
#define PIPECONF_INTERLACE_MODE_MASK (7 << 21)
|
2014-04-05 06:43:28 +00:00
|
|
|
#define PIPECONF_EDP_RR_MODE_SWITCH (1 << 20)
|
2009-08-17 20:31:43 +00:00
|
|
|
#define PIPECONF_CXSR_DOWNCLOCK (1<<16)
|
2015-02-13 10:03:01 +00:00
|
|
|
#define PIPECONF_EDP_RR_MODE_SWITCH_VLV (1 << 14)
|
2013-01-17 14:31:28 +00:00
|
|
|
#define PIPECONF_COLOR_RANGE_SELECT (1 << 13)
|
2012-12-17 10:21:38 +00:00
|
|
|
#define PIPECONF_BPC_MASK (0x7 << 5)
|
|
|
|
#define PIPECONF_8BPC (0<<5)
|
|
|
|
#define PIPECONF_10BPC (1<<5)
|
|
|
|
#define PIPECONF_6BPC (2<<5)
|
|
|
|
#define PIPECONF_12BPC (3<<5)
|
2010-09-07 21:48:05 +00:00
|
|
|
#define PIPECONF_DITHER_EN (1<<4)
|
|
|
|
#define PIPECONF_DITHER_TYPE_MASK (0x0000000c)
|
|
|
|
#define PIPECONF_DITHER_TYPE_SP (0<<2)
|
|
|
|
#define PIPECONF_DITHER_TYPE_ST1 (1<<2)
|
|
|
|
#define PIPECONF_DITHER_TYPE_ST2 (2<<2)
|
|
|
|
#define PIPECONF_DITHER_TYPE_TEMP (3<<2)
|
drm/i915: Reorganize display pipe register accesses
RFCv2: Reorganize array indexing so that full offsets can be used as
is. It makes grepping for registers in i915_reg.h much easier. Also
move offset arrays to intel_device_info.
v1: Fixed offsets for VLV, proper eDP handling
v2: Fixed BCLRPAT, PIPESRC, PIPECONF and DSP* macros.
v3: Added EDP pipe comment, removed redundant offset arrays for
MSA_MISC and DDI_FUNC_CTL.
v4: Rename patch and report object size increase.
v5: Change location of commas, add PIPE_EDP into enum pipe
v6: Insert PIPE_EDP_OFFSET into pipe offset array
v7: Set I915_MAX_PIPES back to 3, change more registers accessors
to use the new macros, get rid of _PIPE_INC and add dev_priv
as a parameter where required by the new macros.
Upcoming hardware will not have the various display pipe register
ranges evenly spaced in memory. Change register address calculations
into array lookups.
Tested on SNB, VLV, IVB, Gen2 and HSW w/eDP.
I left the UMS cruft untouched.
Size differences:
text data bss dec hex filename
596431 4634 56 601121 92c21 i915.ko (new)
593199 4634 56 597889 91f81 i915.ko (old)
Signed-off-by: Antti Koskipaa <antti.koskipaa@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Tested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-02-04 12:22:24 +00:00
|
|
|
#define _PIPEASTAT 0x70024
|
2008-07-29 18:54:06 +00:00
|
|
|
#define PIPE_FIFO_UNDERRUN_STATUS (1UL<<31)
|
2014-02-04 19:35:48 +00:00
|
|
|
#define SPRITE1_FLIP_DONE_INT_EN_VLV (1UL<<30)
|
2008-07-29 18:54:06 +00:00
|
|
|
#define PIPE_CRC_ERROR_ENABLE (1UL<<29)
|
|
|
|
#define PIPE_CRC_DONE_ENABLE (1UL<<28)
|
2014-04-09 10:28:04 +00:00
|
|
|
#define PERF_COUNTER2_INTERRUPT_EN (1UL<<27)
|
2008-07-29 18:54:06 +00:00
|
|
|
#define PIPE_GMBUS_EVENT_ENABLE (1UL<<27)
|
2012-03-28 20:39:24 +00:00
|
|
|
#define PLANE_FLIP_DONE_INT_EN_VLV (1UL<<26)
|
2008-07-29 18:54:06 +00:00
|
|
|
#define PIPE_HOTPLUG_INTERRUPT_ENABLE (1UL<<26)
|
|
|
|
#define PIPE_VSYNC_INTERRUPT_ENABLE (1UL<<25)
|
|
|
|
#define PIPE_DISPLAY_LINE_COMPARE_ENABLE (1UL<<24)
|
|
|
|
#define PIPE_DPST_EVENT_ENABLE (1UL<<23)
|
2013-01-16 17:59:03 +00:00
|
|
|
#define SPRITE0_FLIP_DONE_INT_EN_VLV (1UL<<22)
|
2008-07-29 18:54:06 +00:00
|
|
|
#define PIPE_LEGACY_BLC_EVENT_ENABLE (1UL<<22)
|
|
|
|
#define PIPE_ODD_FIELD_INTERRUPT_ENABLE (1UL<<21)
|
|
|
|
#define PIPE_EVEN_FIELD_INTERRUPT_ENABLE (1UL<<20)
|
2014-02-10 16:42:48 +00:00
|
|
|
#define PIPE_B_PSR_INTERRUPT_ENABLE_VLV (1UL<<19)
|
2014-04-09 10:28:04 +00:00
|
|
|
#define PERF_COUNTER_INTERRUPT_EN (1UL<<19)
|
2008-07-29 18:54:06 +00:00
|
|
|
#define PIPE_HOTPLUG_TV_INTERRUPT_ENABLE (1UL<<18) /* pre-965 */
|
|
|
|
#define PIPE_START_VBLANK_INTERRUPT_ENABLE (1UL<<18) /* 965 or later */
|
2014-04-09 10:28:04 +00:00
|
|
|
#define PIPE_FRAMESTART_INTERRUPT_ENABLE (1UL<<17)
|
2008-07-29 18:54:06 +00:00
|
|
|
#define PIPE_VBLANK_INTERRUPT_ENABLE (1UL<<17)
|
2012-03-28 20:39:24 +00:00
|
|
|
#define PIPEA_HBLANK_INT_EN_VLV (1UL<<16)
|
2008-07-29 18:54:06 +00:00
|
|
|
#define PIPE_OVERLAY_UPDATED_ENABLE (1UL<<16)
|
2014-02-04 19:35:48 +00:00
|
|
|
#define SPRITE1_FLIP_DONE_INT_STATUS_VLV (1UL<<15)
|
|
|
|
#define SPRITE0_FLIP_DONE_INT_STATUS_VLV (1UL<<14)
|
2008-07-29 18:54:06 +00:00
|
|
|
#define PIPE_CRC_ERROR_INTERRUPT_STATUS (1UL<<13)
|
|
|
|
#define PIPE_CRC_DONE_INTERRUPT_STATUS (1UL<<12)
|
2014-04-09 10:28:04 +00:00
|
|
|
#define PERF_COUNTER2_INTERRUPT_STATUS (1UL<<11)
|
2008-07-29 18:54:06 +00:00
|
|
|
#define PIPE_GMBUS_INTERRUPT_STATUS (1UL<<11)
|
2014-02-04 19:35:48 +00:00
|
|
|
#define PLANE_FLIP_DONE_INT_STATUS_VLV (1UL<<10)
|
2008-07-29 18:54:06 +00:00
|
|
|
#define PIPE_HOTPLUG_INTERRUPT_STATUS (1UL<<10)
|
|
|
|
#define PIPE_VSYNC_INTERRUPT_STATUS (1UL<<9)
|
|
|
|
#define PIPE_DISPLAY_LINE_COMPARE_STATUS (1UL<<8)
|
|
|
|
#define PIPE_DPST_EVENT_STATUS (1UL<<7)
|
2014-02-10 16:42:48 +00:00
|
|
|
#define PIPE_A_PSR_STATUS_VLV (1UL<<6)
|
2014-04-09 10:28:04 +00:00
|
|
|
#define PIPE_LEGACY_BLC_EVENT_STATUS (1UL<<6)
|
2008-07-29 18:54:06 +00:00
|
|
|
#define PIPE_ODD_FIELD_INTERRUPT_STATUS (1UL<<5)
|
|
|
|
#define PIPE_EVEN_FIELD_INTERRUPT_STATUS (1UL<<4)
|
2014-02-10 16:42:48 +00:00
|
|
|
#define PIPE_B_PSR_STATUS_VLV (1UL<<3)
|
2014-04-09 10:28:04 +00:00
|
|
|
#define PERF_COUNTER_INTERRUPT_STATUS (1UL<<3)
|
2008-07-29 18:54:06 +00:00
|
|
|
#define PIPE_HOTPLUG_TV_INTERRUPT_STATUS (1UL<<2) /* pre-965 */
|
|
|
|
#define PIPE_START_VBLANK_INTERRUPT_STATUS (1UL<<2) /* 965 or later */
|
2014-04-09 10:28:04 +00:00
|
|
|
#define PIPE_FRAMESTART_INTERRUPT_STATUS (1UL<<1)
|
2008-07-29 18:54:06 +00:00
|
|
|
#define PIPE_VBLANK_INTERRUPT_STATUS (1UL<<1)
|
2014-04-09 10:28:04 +00:00
|
|
|
#define PIPE_HBLANK_INT_STATUS (1UL<<0)
|
2008-07-29 18:54:06 +00:00
|
|
|
#define PIPE_OVERLAY_UPDATED_STATUS (1UL<<0)
|
|
|
|
|
2014-02-10 16:42:47 +00:00
|
|
|
#define PIPESTAT_INT_ENABLE_MASK 0x7fff0000
|
|
|
|
#define PIPESTAT_INT_STATUS_MASK 0x0000ffff
|
|
|
|
|
2014-04-28 11:00:42 +00:00
|
|
|
#define PIPE_A_OFFSET 0x70000
|
|
|
|
#define PIPE_B_OFFSET 0x71000
|
|
|
|
#define PIPE_C_OFFSET 0x72000
|
|
|
|
#define CHV_PIPE_C_OFFSET 0x74000
|
drm/i915: Reorganize display pipe register accesses
RFCv2: Reorganize array indexing so that full offsets can be used as
is. It makes grepping for registers in i915_reg.h much easier. Also
move offset arrays to intel_device_info.
v1: Fixed offsets for VLV, proper eDP handling
v2: Fixed BCLRPAT, PIPESRC, PIPECONF and DSP* macros.
v3: Added EDP pipe comment, removed redundant offset arrays for
MSA_MISC and DDI_FUNC_CTL.
v4: Rename patch and report object size increase.
v5: Change location of commas, add PIPE_EDP into enum pipe
v6: Insert PIPE_EDP_OFFSET into pipe offset array
v7: Set I915_MAX_PIPES back to 3, change more registers accessors
to use the new macros, get rid of _PIPE_INC and add dev_priv
as a parameter where required by the new macros.
Upcoming hardware will not have the various display pipe register
ranges evenly spaced in memory. Change register address calculations
into array lookups.
Tested on SNB, VLV, IVB, Gen2 and HSW w/eDP.
I left the UMS cruft untouched.
Size differences:
text data bss dec hex filename
596431 4634 56 601121 92c21 i915.ko (new)
593199 4634 56 597889 91f81 i915.ko (old)
Signed-off-by: Antti Koskipaa <antti.koskipaa@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Tested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-02-04 12:22:24 +00:00
|
|
|
/*
|
|
|
|
* There's actually no pipe EDP. Some pipe registers have
|
|
|
|
* simply shifted from the pipe to the transcoder, while
|
|
|
|
* keeping their original offset. Thus we need PIPE_EDP_OFFSET
|
|
|
|
* to access such registers in transcoder EDP.
|
|
|
|
*/
|
|
|
|
#define PIPE_EDP_OFFSET 0x7f000
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define _MMIO_PIPE2(pipe, reg) _MMIO(dev_priv->info.pipe_offsets[pipe] - \
|
2014-02-07 19:12:48 +00:00
|
|
|
dev_priv->info.pipe_offsets[PIPE_A] + (reg) + \
|
|
|
|
dev_priv->info.display_mmio_offset)
|
drm/i915: Reorganize display pipe register accesses
RFCv2: Reorganize array indexing so that full offsets can be used as
is. It makes grepping for registers in i915_reg.h much easier. Also
move offset arrays to intel_device_info.
v1: Fixed offsets for VLV, proper eDP handling
v2: Fixed BCLRPAT, PIPESRC, PIPECONF and DSP* macros.
v3: Added EDP pipe comment, removed redundant offset arrays for
MSA_MISC and DDI_FUNC_CTL.
v4: Rename patch and report object size increase.
v5: Change location of commas, add PIPE_EDP into enum pipe
v6: Insert PIPE_EDP_OFFSET into pipe offset array
v7: Set I915_MAX_PIPES back to 3, change more registers accessors
to use the new macros, get rid of _PIPE_INC and add dev_priv
as a parameter where required by the new macros.
Upcoming hardware will not have the various display pipe register
ranges evenly spaced in memory. Change register address calculations
into array lookups.
Tested on SNB, VLV, IVB, Gen2 and HSW w/eDP.
I left the UMS cruft untouched.
Size differences:
text data bss dec hex filename
596431 4634 56 601121 92c21 i915.ko (new)
593199 4634 56 597889 91f81 i915.ko (old)
Signed-off-by: Antti Koskipaa <antti.koskipaa@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Tested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-02-04 12:22:24 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define PIPECONF(pipe) _MMIO_PIPE2(pipe, _PIPEACONF)
|
|
|
|
#define PIPEDSL(pipe) _MMIO_PIPE2(pipe, _PIPEADSL)
|
|
|
|
#define PIPEFRAME(pipe) _MMIO_PIPE2(pipe, _PIPEAFRAMEHIGH)
|
|
|
|
#define PIPEFRAMEPIXEL(pipe) _MMIO_PIPE2(pipe, _PIPEAFRAMEPIXEL)
|
|
|
|
#define PIPESTAT(pipe) _MMIO_PIPE2(pipe, _PIPEASTAT)
|
2010-09-11 12:48:45 +00:00
|
|
|
|
2013-11-03 04:07:38 +00:00
|
|
|
#define _PIPE_MISC_A 0x70030
|
|
|
|
#define _PIPE_MISC_B 0x71030
|
|
|
|
#define PIPEMISC_DITHER_BPC_MASK (7<<5)
|
|
|
|
#define PIPEMISC_DITHER_8_BPC (0<<5)
|
|
|
|
#define PIPEMISC_DITHER_10_BPC (1<<5)
|
|
|
|
#define PIPEMISC_DITHER_6_BPC (2<<5)
|
|
|
|
#define PIPEMISC_DITHER_12_BPC (3<<5)
|
|
|
|
#define PIPEMISC_DITHER_ENABLE (1<<4)
|
|
|
|
#define PIPEMISC_DITHER_TYPE_MASK (3<<2)
|
|
|
|
#define PIPEMISC_DITHER_TYPE_SP (0<<2)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define PIPEMISC(pipe) _MMIO_PIPE2(pipe, _PIPE_MISC_A)
|
2013-11-03 04:07:38 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define VLV_DPFLIPSTAT _MMIO(VLV_DISPLAY_BASE + 0x70028)
|
2012-06-20 17:53:12 +00:00
|
|
|
#define PIPEB_LINE_COMPARE_INT_EN (1<<29)
|
2012-03-28 20:39:24 +00:00
|
|
|
#define PIPEB_HLINE_INT_EN (1<<28)
|
|
|
|
#define PIPEB_VBLANK_INT_EN (1<<27)
|
2014-02-04 19:35:48 +00:00
|
|
|
#define SPRITED_FLIP_DONE_INT_EN (1<<26)
|
|
|
|
#define SPRITEC_FLIP_DONE_INT_EN (1<<25)
|
|
|
|
#define PLANEB_FLIP_DONE_INT_EN (1<<24)
|
2014-04-09 10:28:05 +00:00
|
|
|
#define PIPE_PSR_INT_EN (1<<22)
|
2012-06-20 17:53:12 +00:00
|
|
|
#define PIPEA_LINE_COMPARE_INT_EN (1<<21)
|
2012-03-28 20:39:24 +00:00
|
|
|
#define PIPEA_HLINE_INT_EN (1<<20)
|
|
|
|
#define PIPEA_VBLANK_INT_EN (1<<19)
|
2014-02-04 19:35:48 +00:00
|
|
|
#define SPRITEB_FLIP_DONE_INT_EN (1<<18)
|
|
|
|
#define SPRITEA_FLIP_DONE_INT_EN (1<<17)
|
2012-03-28 20:39:24 +00:00
|
|
|
#define PLANEA_FLIPDONE_INT_EN (1<<16)
|
2014-04-09 10:28:05 +00:00
|
|
|
#define PIPEC_LINE_COMPARE_INT_EN (1<<13)
|
|
|
|
#define PIPEC_HLINE_INT_EN (1<<12)
|
|
|
|
#define PIPEC_VBLANK_INT_EN (1<<11)
|
|
|
|
#define SPRITEF_FLIPDONE_INT_EN (1<<10)
|
|
|
|
#define SPRITEE_FLIPDONE_INT_EN (1<<9)
|
|
|
|
#define PLANEC_FLIPDONE_INT_EN (1<<8)
|
2012-03-28 20:39:24 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define DPINVGTT _MMIO(VLV_DISPLAY_BASE + 0x7002c) /* VLV/CHV only */
|
2014-05-02 08:35:51 +00:00
|
|
|
#define SPRITEF_INVALID_GTT_INT_EN (1<<27)
|
|
|
|
#define SPRITEE_INVALID_GTT_INT_EN (1<<26)
|
|
|
|
#define PLANEC_INVALID_GTT_INT_EN (1<<25)
|
|
|
|
#define CURSORC_INVALID_GTT_INT_EN (1<<24)
|
2012-03-28 20:39:24 +00:00
|
|
|
#define CURSORB_INVALID_GTT_INT_EN (1<<23)
|
|
|
|
#define CURSORA_INVALID_GTT_INT_EN (1<<22)
|
|
|
|
#define SPRITED_INVALID_GTT_INT_EN (1<<21)
|
|
|
|
#define SPRITEC_INVALID_GTT_INT_EN (1<<20)
|
|
|
|
#define PLANEB_INVALID_GTT_INT_EN (1<<19)
|
|
|
|
#define SPRITEB_INVALID_GTT_INT_EN (1<<18)
|
|
|
|
#define SPRITEA_INVALID_GTT_INT_EN (1<<17)
|
|
|
|
#define PLANEA_INVALID_GTT_INT_EN (1<<16)
|
|
|
|
#define DPINVGTT_EN_MASK 0xff0000
|
2014-05-02 08:35:51 +00:00
|
|
|
#define DPINVGTT_EN_MASK_CHV 0xfff0000
|
|
|
|
#define SPRITEF_INVALID_GTT_STATUS (1<<11)
|
|
|
|
#define SPRITEE_INVALID_GTT_STATUS (1<<10)
|
|
|
|
#define PLANEC_INVALID_GTT_STATUS (1<<9)
|
|
|
|
#define CURSORC_INVALID_GTT_STATUS (1<<8)
|
2012-03-28 20:39:24 +00:00
|
|
|
#define CURSORB_INVALID_GTT_STATUS (1<<7)
|
|
|
|
#define CURSORA_INVALID_GTT_STATUS (1<<6)
|
|
|
|
#define SPRITED_INVALID_GTT_STATUS (1<<5)
|
|
|
|
#define SPRITEC_INVALID_GTT_STATUS (1<<4)
|
|
|
|
#define PLANEB_INVALID_GTT_STATUS (1<<3)
|
|
|
|
#define SPRITEB_INVALID_GTT_STATUS (1<<2)
|
|
|
|
#define SPRITEA_INVALID_GTT_STATUS (1<<1)
|
|
|
|
#define PLANEA_INVALID_GTT_STATUS (1<<0)
|
|
|
|
#define DPINVGTT_STATUS_MASK 0xff
|
2014-05-02 08:35:51 +00:00
|
|
|
#define DPINVGTT_STATUS_MASK_CHV 0xfff
|
2012-03-28 20:39:24 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define DSPARB _MMIO(dev_priv->info.display_mmio_offset + 0x70030)
|
2008-07-29 18:54:06 +00:00
|
|
|
#define DSPARB_CSTART_MASK (0x7f << 7)
|
|
|
|
#define DSPARB_CSTART_SHIFT 7
|
|
|
|
#define DSPARB_BSTART_MASK (0x7f)
|
|
|
|
#define DSPARB_BSTART_SHIFT 0
|
2009-06-26 03:23:55 +00:00
|
|
|
#define DSPARB_BEND_SHIFT 9 /* on 855 */
|
|
|
|
#define DSPARB_AEND_SHIFT 0
|
2015-06-24 19:00:05 +00:00
|
|
|
#define DSPARB_SPRITEA_SHIFT_VLV 0
|
|
|
|
#define DSPARB_SPRITEA_MASK_VLV (0xff << 0)
|
|
|
|
#define DSPARB_SPRITEB_SHIFT_VLV 8
|
|
|
|
#define DSPARB_SPRITEB_MASK_VLV (0xff << 8)
|
|
|
|
#define DSPARB_SPRITEC_SHIFT_VLV 16
|
|
|
|
#define DSPARB_SPRITEC_MASK_VLV (0xff << 16)
|
|
|
|
#define DSPARB_SPRITED_SHIFT_VLV 24
|
|
|
|
#define DSPARB_SPRITED_MASK_VLV (0xff << 24)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define DSPARB2 _MMIO(VLV_DISPLAY_BASE + 0x70060) /* vlv/chv */
|
2015-06-24 19:00:05 +00:00
|
|
|
#define DSPARB_SPRITEA_HI_SHIFT_VLV 0
|
|
|
|
#define DSPARB_SPRITEA_HI_MASK_VLV (0x1 << 0)
|
|
|
|
#define DSPARB_SPRITEB_HI_SHIFT_VLV 4
|
|
|
|
#define DSPARB_SPRITEB_HI_MASK_VLV (0x1 << 4)
|
|
|
|
#define DSPARB_SPRITEC_HI_SHIFT_VLV 8
|
|
|
|
#define DSPARB_SPRITEC_HI_MASK_VLV (0x1 << 8)
|
|
|
|
#define DSPARB_SPRITED_HI_SHIFT_VLV 12
|
|
|
|
#define DSPARB_SPRITED_HI_MASK_VLV (0x1 << 12)
|
|
|
|
#define DSPARB_SPRITEE_HI_SHIFT_VLV 16
|
|
|
|
#define DSPARB_SPRITEE_HI_MASK_VLV (0x1 << 16)
|
|
|
|
#define DSPARB_SPRITEF_HI_SHIFT_VLV 20
|
|
|
|
#define DSPARB_SPRITEF_HI_MASK_VLV (0x1 << 20)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define DSPARB3 _MMIO(VLV_DISPLAY_BASE + 0x7006c) /* chv */
|
2015-06-24 19:00:05 +00:00
|
|
|
#define DSPARB_SPRITEE_SHIFT_VLV 0
|
|
|
|
#define DSPARB_SPRITEE_MASK_VLV (0xff << 0)
|
|
|
|
#define DSPARB_SPRITEF_SHIFT_VLV 8
|
|
|
|
#define DSPARB_SPRITEF_MASK_VLV (0xff << 8)
|
2015-03-05 19:19:47 +00:00
|
|
|
|
2014-06-11 13:51:18 +00:00
|
|
|
/* pnv/gen4/g4x/vlv/chv */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define DSPFW1 _MMIO(dev_priv->info.display_mmio_offset + 0x70034)
|
2014-06-11 13:51:18 +00:00
|
|
|
#define DSPFW_SR_SHIFT 23
|
|
|
|
#define DSPFW_SR_MASK (0x1ff<<23)
|
|
|
|
#define DSPFW_CURSORB_SHIFT 16
|
|
|
|
#define DSPFW_CURSORB_MASK (0x3f<<16)
|
|
|
|
#define DSPFW_PLANEB_SHIFT 8
|
|
|
|
#define DSPFW_PLANEB_MASK (0x7f<<8)
|
|
|
|
#define DSPFW_PLANEB_MASK_VLV (0xff<<8) /* vlv/chv */
|
|
|
|
#define DSPFW_PLANEA_SHIFT 0
|
|
|
|
#define DSPFW_PLANEA_MASK (0x7f<<0)
|
|
|
|
#define DSPFW_PLANEA_MASK_VLV (0xff<<0) /* vlv/chv */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define DSPFW2 _MMIO(dev_priv->info.display_mmio_offset + 0x70038)
|
2014-06-11 13:51:18 +00:00
|
|
|
#define DSPFW_FBC_SR_EN (1<<31) /* g4x */
|
|
|
|
#define DSPFW_FBC_SR_SHIFT 28
|
|
|
|
#define DSPFW_FBC_SR_MASK (0x7<<28) /* g4x */
|
|
|
|
#define DSPFW_FBC_HPLL_SR_SHIFT 24
|
|
|
|
#define DSPFW_FBC_HPLL_SR_MASK (0xf<<24) /* g4x */
|
|
|
|
#define DSPFW_SPRITEB_SHIFT (16)
|
|
|
|
#define DSPFW_SPRITEB_MASK (0x7f<<16) /* g4x */
|
|
|
|
#define DSPFW_SPRITEB_MASK_VLV (0xff<<16) /* vlv/chv */
|
|
|
|
#define DSPFW_CURSORA_SHIFT 8
|
|
|
|
#define DSPFW_CURSORA_MASK (0x3f<<8)
|
2015-03-10 15:02:21 +00:00
|
|
|
#define DSPFW_PLANEC_OLD_SHIFT 0
|
|
|
|
#define DSPFW_PLANEC_OLD_MASK (0x7f<<0) /* pre-gen4 sprite C */
|
2014-06-11 13:51:18 +00:00
|
|
|
#define DSPFW_SPRITEA_SHIFT 0
|
|
|
|
#define DSPFW_SPRITEA_MASK (0x7f<<0) /* g4x */
|
|
|
|
#define DSPFW_SPRITEA_MASK_VLV (0xff<<0) /* vlv/chv */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define DSPFW3 _MMIO(dev_priv->info.display_mmio_offset + 0x7003c)
|
2014-06-11 13:51:18 +00:00
|
|
|
#define DSPFW_HPLL_SR_EN (1<<31)
|
2009-12-03 22:14:42 +00:00
|
|
|
#define PINEVIEW_SELF_REFRESH_EN (1<<30)
|
2014-06-11 13:51:18 +00:00
|
|
|
#define DSPFW_CURSOR_SR_SHIFT 24
|
2010-03-22 14:45:36 +00:00
|
|
|
#define DSPFW_CURSOR_SR_MASK (0x3f<<24)
|
|
|
|
#define DSPFW_HPLL_CURSOR_SHIFT 16
|
|
|
|
#define DSPFW_HPLL_CURSOR_MASK (0x3f<<16)
|
2014-06-11 13:51:18 +00:00
|
|
|
#define DSPFW_HPLL_SR_SHIFT 0
|
|
|
|
#define DSPFW_HPLL_SR_MASK (0x1ff<<0)
|
|
|
|
|
|
|
|
/* vlv/chv */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define DSPFW4 _MMIO(VLV_DISPLAY_BASE + 0x70070)
|
2014-06-11 13:51:18 +00:00
|
|
|
#define DSPFW_SPRITEB_WM1_SHIFT 16
|
|
|
|
#define DSPFW_SPRITEB_WM1_MASK (0xff<<16)
|
|
|
|
#define DSPFW_CURSORA_WM1_SHIFT 8
|
|
|
|
#define DSPFW_CURSORA_WM1_MASK (0x3f<<8)
|
|
|
|
#define DSPFW_SPRITEA_WM1_SHIFT 0
|
|
|
|
#define DSPFW_SPRITEA_WM1_MASK (0xff<<0)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define DSPFW5 _MMIO(VLV_DISPLAY_BASE + 0x70074)
|
2014-06-11 13:51:18 +00:00
|
|
|
#define DSPFW_PLANEB_WM1_SHIFT 24
|
|
|
|
#define DSPFW_PLANEB_WM1_MASK (0xff<<24)
|
|
|
|
#define DSPFW_PLANEA_WM1_SHIFT 16
|
|
|
|
#define DSPFW_PLANEA_WM1_MASK (0xff<<16)
|
|
|
|
#define DSPFW_CURSORB_WM1_SHIFT 8
|
|
|
|
#define DSPFW_CURSORB_WM1_MASK (0x3f<<8)
|
|
|
|
#define DSPFW_CURSOR_SR_WM1_SHIFT 0
|
|
|
|
#define DSPFW_CURSOR_SR_WM1_MASK (0x3f<<0)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define DSPFW6 _MMIO(VLV_DISPLAY_BASE + 0x70078)
|
2014-06-11 13:51:18 +00:00
|
|
|
#define DSPFW_SR_WM1_SHIFT 0
|
|
|
|
#define DSPFW_SR_WM1_MASK (0x1ff<<0)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define DSPFW7 _MMIO(VLV_DISPLAY_BASE + 0x7007c)
|
|
|
|
#define DSPFW7_CHV _MMIO(VLV_DISPLAY_BASE + 0x700b4) /* wtf #1? */
|
2014-06-11 13:51:18 +00:00
|
|
|
#define DSPFW_SPRITED_WM1_SHIFT 24
|
|
|
|
#define DSPFW_SPRITED_WM1_MASK (0xff<<24)
|
|
|
|
#define DSPFW_SPRITED_SHIFT 16
|
2015-03-10 14:16:28 +00:00
|
|
|
#define DSPFW_SPRITED_MASK_VLV (0xff<<16)
|
2014-06-11 13:51:18 +00:00
|
|
|
#define DSPFW_SPRITEC_WM1_SHIFT 8
|
|
|
|
#define DSPFW_SPRITEC_WM1_MASK (0xff<<8)
|
|
|
|
#define DSPFW_SPRITEC_SHIFT 0
|
2015-03-10 14:16:28 +00:00
|
|
|
#define DSPFW_SPRITEC_MASK_VLV (0xff<<0)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define DSPFW8_CHV _MMIO(VLV_DISPLAY_BASE + 0x700b8)
|
2014-06-11 13:51:18 +00:00
|
|
|
#define DSPFW_SPRITEF_WM1_SHIFT 24
|
|
|
|
#define DSPFW_SPRITEF_WM1_MASK (0xff<<24)
|
|
|
|
#define DSPFW_SPRITEF_SHIFT 16
|
2015-03-10 14:16:28 +00:00
|
|
|
#define DSPFW_SPRITEF_MASK_VLV (0xff<<16)
|
2014-06-11 13:51:18 +00:00
|
|
|
#define DSPFW_SPRITEE_WM1_SHIFT 8
|
|
|
|
#define DSPFW_SPRITEE_WM1_MASK (0xff<<8)
|
|
|
|
#define DSPFW_SPRITEE_SHIFT 0
|
2015-03-10 14:16:28 +00:00
|
|
|
#define DSPFW_SPRITEE_MASK_VLV (0xff<<0)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define DSPFW9_CHV _MMIO(VLV_DISPLAY_BASE + 0x7007c) /* wtf #2? */
|
2014-06-11 13:51:18 +00:00
|
|
|
#define DSPFW_PLANEC_WM1_SHIFT 24
|
|
|
|
#define DSPFW_PLANEC_WM1_MASK (0xff<<24)
|
|
|
|
#define DSPFW_PLANEC_SHIFT 16
|
2015-03-10 14:16:28 +00:00
|
|
|
#define DSPFW_PLANEC_MASK_VLV (0xff<<16)
|
2014-06-11 13:51:18 +00:00
|
|
|
#define DSPFW_CURSORC_WM1_SHIFT 8
|
|
|
|
#define DSPFW_CURSORC_WM1_MASK (0x3f<<16)
|
|
|
|
#define DSPFW_CURSORC_SHIFT 0
|
|
|
|
#define DSPFW_CURSORC_MASK (0x3f<<0)
|
|
|
|
|
|
|
|
/* vlv/chv high order bits */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define DSPHOWM _MMIO(VLV_DISPLAY_BASE + 0x70064)
|
2014-06-11 13:51:18 +00:00
|
|
|
#define DSPFW_SR_HI_SHIFT 24
|
2015-03-05 19:19:49 +00:00
|
|
|
#define DSPFW_SR_HI_MASK (3<<24) /* 2 bits for chv, 1 for vlv */
|
2014-06-11 13:51:18 +00:00
|
|
|
#define DSPFW_SPRITEF_HI_SHIFT 23
|
|
|
|
#define DSPFW_SPRITEF_HI_MASK (1<<23)
|
|
|
|
#define DSPFW_SPRITEE_HI_SHIFT 22
|
|
|
|
#define DSPFW_SPRITEE_HI_MASK (1<<22)
|
|
|
|
#define DSPFW_PLANEC_HI_SHIFT 21
|
|
|
|
#define DSPFW_PLANEC_HI_MASK (1<<21)
|
|
|
|
#define DSPFW_SPRITED_HI_SHIFT 20
|
|
|
|
#define DSPFW_SPRITED_HI_MASK (1<<20)
|
|
|
|
#define DSPFW_SPRITEC_HI_SHIFT 16
|
|
|
|
#define DSPFW_SPRITEC_HI_MASK (1<<16)
|
|
|
|
#define DSPFW_PLANEB_HI_SHIFT 12
|
|
|
|
#define DSPFW_PLANEB_HI_MASK (1<<12)
|
|
|
|
#define DSPFW_SPRITEB_HI_SHIFT 8
|
|
|
|
#define DSPFW_SPRITEB_HI_MASK (1<<8)
|
|
|
|
#define DSPFW_SPRITEA_HI_SHIFT 4
|
|
|
|
#define DSPFW_SPRITEA_HI_MASK (1<<4)
|
|
|
|
#define DSPFW_PLANEA_HI_SHIFT 0
|
|
|
|
#define DSPFW_PLANEA_HI_MASK (1<<0)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define DSPHOWM1 _MMIO(VLV_DISPLAY_BASE + 0x70068)
|
2014-06-11 13:51:18 +00:00
|
|
|
#define DSPFW_SR_WM1_HI_SHIFT 24
|
2015-03-05 19:19:49 +00:00
|
|
|
#define DSPFW_SR_WM1_HI_MASK (3<<24) /* 2 bits for chv, 1 for vlv */
|
2014-06-11 13:51:18 +00:00
|
|
|
#define DSPFW_SPRITEF_WM1_HI_SHIFT 23
|
|
|
|
#define DSPFW_SPRITEF_WM1_HI_MASK (1<<23)
|
|
|
|
#define DSPFW_SPRITEE_WM1_HI_SHIFT 22
|
|
|
|
#define DSPFW_SPRITEE_WM1_HI_MASK (1<<22)
|
|
|
|
#define DSPFW_PLANEC_WM1_HI_SHIFT 21
|
|
|
|
#define DSPFW_PLANEC_WM1_HI_MASK (1<<21)
|
|
|
|
#define DSPFW_SPRITED_WM1_HI_SHIFT 20
|
|
|
|
#define DSPFW_SPRITED_WM1_HI_MASK (1<<20)
|
|
|
|
#define DSPFW_SPRITEC_WM1_HI_SHIFT 16
|
|
|
|
#define DSPFW_SPRITEC_WM1_HI_MASK (1<<16)
|
|
|
|
#define DSPFW_PLANEB_WM1_HI_SHIFT 12
|
|
|
|
#define DSPFW_PLANEB_WM1_HI_MASK (1<<12)
|
|
|
|
#define DSPFW_SPRITEB_WM1_HI_SHIFT 8
|
|
|
|
#define DSPFW_SPRITEB_WM1_HI_MASK (1<<8)
|
|
|
|
#define DSPFW_SPRITEA_WM1_HI_SHIFT 4
|
|
|
|
#define DSPFW_SPRITEA_WM1_HI_MASK (1<<4)
|
|
|
|
#define DSPFW_PLANEA_WM1_HI_SHIFT 0
|
|
|
|
#define DSPFW_PLANEA_WM1_HI_MASK (1<<0)
|
2009-06-26 03:23:55 +00:00
|
|
|
|
2012-03-28 20:39:30 +00:00
|
|
|
/* drain latency register values*/
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define VLV_DDL(pipe) _MMIO(VLV_DISPLAY_BASE + 0x70050 + 4 * (pipe))
|
2014-06-26 14:02:37 +00:00
|
|
|
#define DDL_CURSOR_SHIFT 24
|
2014-08-07 11:33:30 +00:00
|
|
|
#define DDL_SPRITE_SHIFT(sprite) (8+8*(sprite))
|
2014-06-26 14:02:37 +00:00
|
|
|
#define DDL_PLANE_SHIFT 0
|
2015-03-05 19:19:44 +00:00
|
|
|
#define DDL_PRECISION_HIGH (1<<7)
|
|
|
|
#define DDL_PRECISION_LOW (0<<7)
|
2014-08-06 20:28:24 +00:00
|
|
|
#define DRAIN_LATENCY_MASK 0x7f
|
2012-03-28 20:39:30 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define CBR1_VLV _MMIO(VLV_DISPLAY_BASE + 0x70400)
|
2015-03-05 19:19:48 +00:00
|
|
|
#define CBR_PND_DEADLINE_DISABLE (1<<31)
|
2015-09-04 13:55:14 +00:00
|
|
|
#define CBR_PWM_CLOCK_MUX_SELECT (1<<30)
|
2015-03-05 19:19:48 +00:00
|
|
|
|
2016-03-15 14:39:56 +00:00
|
|
|
#define CBR4_VLV _MMIO(VLV_DISPLAY_BASE + 0x70450)
|
|
|
|
#define CBR_DPLLBMD_PIPE_C (1<<29)
|
|
|
|
#define CBR_DPLLBMD_PIPE_B (1<<18)
|
|
|
|
|
2009-06-26 03:23:55 +00:00
|
|
|
/* FIFO watermark sizes etc */
|
2009-10-19 01:09:33 +00:00
|
|
|
#define G4X_FIFO_LINE_SIZE 64
|
2009-06-26 03:23:55 +00:00
|
|
|
#define I915_FIFO_LINE_SIZE 64
|
|
|
|
#define I830_FIFO_LINE_SIZE 32
|
2009-10-19 01:09:33 +00:00
|
|
|
|
2012-03-28 20:39:22 +00:00
|
|
|
#define VALLEYVIEW_FIFO_SIZE 255
|
2009-10-19 01:09:33 +00:00
|
|
|
#define G4X_FIFO_SIZE 127
|
2010-06-12 06:32:24 +00:00
|
|
|
#define I965_FIFO_SIZE 512
|
|
|
|
#define I945_FIFO_SIZE 127
|
2009-06-26 03:23:55 +00:00
|
|
|
#define I915_FIFO_SIZE 95
|
2009-07-14 17:15:56 +00:00
|
|
|
#define I855GM_FIFO_SIZE 127 /* In cachelines */
|
2009-06-26 03:23:55 +00:00
|
|
|
#define I830_FIFO_SIZE 95
|
2009-10-19 01:09:33 +00:00
|
|
|
|
2012-03-28 20:39:22 +00:00
|
|
|
#define VALLEYVIEW_MAX_WM 0xff
|
2009-10-19 01:09:33 +00:00
|
|
|
#define G4X_MAX_WM 0x3f
|
2009-06-26 03:23:55 +00:00
|
|
|
#define I915_MAX_WM 0x3f
|
|
|
|
|
2009-12-03 22:14:42 +00:00
|
|
|
#define PINEVIEW_DISPLAY_FIFO 512 /* in 64byte unit */
|
|
|
|
#define PINEVIEW_FIFO_LINE_SIZE 64
|
|
|
|
#define PINEVIEW_MAX_WM 0x1ff
|
|
|
|
#define PINEVIEW_DFT_WM 0x3f
|
|
|
|
#define PINEVIEW_DFT_HPLLOFF_WM 0
|
|
|
|
#define PINEVIEW_GUARD_WM 10
|
|
|
|
#define PINEVIEW_CURSOR_FIFO 64
|
|
|
|
#define PINEVIEW_CURSOR_MAX_WM 0x3f
|
|
|
|
#define PINEVIEW_CURSOR_DFT_WM 0
|
|
|
|
#define PINEVIEW_CURSOR_GUARD_WM 5
|
2009-06-26 03:23:55 +00:00
|
|
|
|
2012-03-28 20:39:22 +00:00
|
|
|
#define VALLEYVIEW_CURSOR_MAX_WM 64
|
2010-06-12 06:32:25 +00:00
|
|
|
#define I965_CURSOR_FIFO 64
|
|
|
|
#define I965_CURSOR_MAX_WM 32
|
|
|
|
#define I965_CURSOR_DFT_WM 8
|
2010-04-01 05:07:53 +00:00
|
|
|
|
2014-11-04 17:06:39 +00:00
|
|
|
/* Watermark register definitions for SKL */
|
2015-11-04 21:20:01 +00:00
|
|
|
#define _CUR_WM_A_0 0x70140
|
|
|
|
#define _CUR_WM_B_0 0x71140
|
|
|
|
#define _PLANE_WM_1_A_0 0x70240
|
|
|
|
#define _PLANE_WM_1_B_0 0x71240
|
|
|
|
#define _PLANE_WM_2_A_0 0x70340
|
|
|
|
#define _PLANE_WM_2_B_0 0x71340
|
|
|
|
#define _PLANE_WM_TRANS_1_A_0 0x70268
|
|
|
|
#define _PLANE_WM_TRANS_1_B_0 0x71268
|
|
|
|
#define _PLANE_WM_TRANS_2_A_0 0x70368
|
|
|
|
#define _PLANE_WM_TRANS_2_B_0 0x71368
|
|
|
|
#define _CUR_WM_TRANS_A_0 0x70168
|
|
|
|
#define _CUR_WM_TRANS_B_0 0x71168
|
2014-11-04 17:06:39 +00:00
|
|
|
#define PLANE_WM_EN (1 << 31)
|
|
|
|
#define PLANE_WM_LINES_SHIFT 14
|
|
|
|
#define PLANE_WM_LINES_MASK 0x1f
|
|
|
|
#define PLANE_WM_BLOCKS_MASK 0x3ff
|
|
|
|
|
2015-11-04 21:20:01 +00:00
|
|
|
#define _CUR_WM_0(pipe) _PIPE(pipe, _CUR_WM_A_0, _CUR_WM_B_0)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define CUR_WM(pipe, level) _MMIO(_CUR_WM_0(pipe) + ((4) * (level)))
|
|
|
|
#define CUR_WM_TRANS(pipe) _MMIO_PIPE(pipe, _CUR_WM_TRANS_A_0, _CUR_WM_TRANS_B_0)
|
2014-11-04 17:06:39 +00:00
|
|
|
|
2015-11-04 21:20:01 +00:00
|
|
|
#define _PLANE_WM_1(pipe) _PIPE(pipe, _PLANE_WM_1_A_0, _PLANE_WM_1_B_0)
|
|
|
|
#define _PLANE_WM_2(pipe) _PIPE(pipe, _PLANE_WM_2_A_0, _PLANE_WM_2_B_0)
|
2014-11-04 17:06:39 +00:00
|
|
|
#define _PLANE_WM_BASE(pipe, plane) \
|
|
|
|
_PLANE(plane, _PLANE_WM_1(pipe), _PLANE_WM_2(pipe))
|
|
|
|
#define PLANE_WM(pipe, plane, level) \
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
_MMIO(_PLANE_WM_BASE(pipe, plane) + ((4) * (level)))
|
2014-11-04 17:06:39 +00:00
|
|
|
#define _PLANE_WM_TRANS_1(pipe) \
|
2015-11-04 21:20:01 +00:00
|
|
|
_PIPE(pipe, _PLANE_WM_TRANS_1_A_0, _PLANE_WM_TRANS_1_B_0)
|
2014-11-04 17:06:39 +00:00
|
|
|
#define _PLANE_WM_TRANS_2(pipe) \
|
2015-11-04 21:20:01 +00:00
|
|
|
_PIPE(pipe, _PLANE_WM_TRANS_2_A_0, _PLANE_WM_TRANS_2_B_0)
|
2014-11-04 17:06:39 +00:00
|
|
|
#define PLANE_WM_TRANS(pipe, plane) \
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
_MMIO(_PLANE(plane, _PLANE_WM_TRANS_1(pipe), _PLANE_WM_TRANS_2(pipe)))
|
2014-11-04 17:06:39 +00:00
|
|
|
|
2010-04-01 05:07:53 +00:00
|
|
|
/* define the Watermark register on Ironlake */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define WM0_PIPEA_ILK _MMIO(0x45100)
|
2013-10-09 16:18:07 +00:00
|
|
|
#define WM0_PIPE_PLANE_MASK (0xffff<<16)
|
2010-04-01 05:07:53 +00:00
|
|
|
#define WM0_PIPE_PLANE_SHIFT 16
|
2013-10-09 16:18:07 +00:00
|
|
|
#define WM0_PIPE_SPRITE_MASK (0xff<<8)
|
2010-04-01 05:07:53 +00:00
|
|
|
#define WM0_PIPE_SPRITE_SHIFT 8
|
2013-10-09 16:18:07 +00:00
|
|
|
#define WM0_PIPE_CURSOR_MASK (0xff)
|
2010-04-01 05:07:53 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define WM0_PIPEB_ILK _MMIO(0x45104)
|
|
|
|
#define WM0_PIPEC_IVB _MMIO(0x45200)
|
|
|
|
#define WM1_LP_ILK _MMIO(0x45108)
|
2010-04-01 05:07:53 +00:00
|
|
|
#define WM1_LP_SR_EN (1<<31)
|
|
|
|
#define WM1_LP_LATENCY_SHIFT 24
|
|
|
|
#define WM1_LP_LATENCY_MASK (0x7f<<24)
|
2010-09-11 09:46:47 +00:00
|
|
|
#define WM1_LP_FBC_MASK (0xf<<20)
|
|
|
|
#define WM1_LP_FBC_SHIFT 20
|
2013-11-03 04:07:46 +00:00
|
|
|
#define WM1_LP_FBC_SHIFT_BDW 19
|
2013-10-09 16:18:07 +00:00
|
|
|
#define WM1_LP_SR_MASK (0x7ff<<8)
|
2010-04-01 05:07:53 +00:00
|
|
|
#define WM1_LP_SR_SHIFT 8
|
2013-10-09 16:18:07 +00:00
|
|
|
#define WM1_LP_CURSOR_MASK (0xff)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define WM2_LP_ILK _MMIO(0x4510c)
|
2010-09-09 18:58:02 +00:00
|
|
|
#define WM2_LP_EN (1<<31)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define WM3_LP_ILK _MMIO(0x45110)
|
2010-09-09 18:58:02 +00:00
|
|
|
#define WM3_LP_EN (1<<31)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define WM1S_LP_ILK _MMIO(0x45120)
|
|
|
|
#define WM2S_LP_IVB _MMIO(0x45124)
|
|
|
|
#define WM3S_LP_IVB _MMIO(0x45128)
|
2010-09-09 18:58:02 +00:00
|
|
|
#define WM1S_LP_EN (1<<31)
|
2010-04-01 05:07:53 +00:00
|
|
|
|
2013-05-31 14:45:06 +00:00
|
|
|
#define HSW_WM_LP_VAL(lat, fbc, pri, cur) \
|
|
|
|
(WM3_LP_EN | ((lat) << WM1_LP_LATENCY_SHIFT) | \
|
|
|
|
((fbc) << WM1_LP_FBC_SHIFT) | ((pri) << WM1_LP_SR_SHIFT) | (cur))
|
|
|
|
|
2010-04-01 05:07:53 +00:00
|
|
|
/* Memory latency timer register */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define MLTR_ILK _MMIO(0x11222)
|
2010-12-21 21:10:23 +00:00
|
|
|
#define MLTR_WM1_SHIFT 0
|
|
|
|
#define MLTR_WM2_SHIFT 8
|
2010-04-01 05:07:53 +00:00
|
|
|
/* the unit of memory self-refresh latency time is 0.5us */
|
|
|
|
#define ILK_SRLT_MASK 0x3f
|
|
|
|
|
2010-12-15 07:42:31 +00:00
|
|
|
|
|
|
|
/* the address where we get all kinds of latency value */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define SSKPD _MMIO(0x5d10)
|
2010-12-15 07:42:31 +00:00
|
|
|
#define SSKPD_WM_MASK 0x3f
|
|
|
|
#define SSKPD_WM0_SHIFT 0
|
|
|
|
#define SSKPD_WM1_SHIFT 8
|
|
|
|
#define SSKPD_WM2_SHIFT 16
|
|
|
|
#define SSKPD_WM3_SHIFT 24
|
|
|
|
|
2008-07-29 18:54:06 +00:00
|
|
|
/*
|
|
|
|
* The two pipe frame counter registers are not synchronized, so
|
|
|
|
* reading a stable value is somewhat tricky. The following code
|
|
|
|
* should work:
|
|
|
|
*
|
|
|
|
* do {
|
|
|
|
* high1 = ((INREG(PIPEAFRAMEHIGH) & PIPE_FRAME_HIGH_MASK) >>
|
|
|
|
* PIPE_FRAME_HIGH_SHIFT;
|
|
|
|
* low1 = ((INREG(PIPEAFRAMEPIXEL) & PIPE_FRAME_LOW_MASK) >>
|
|
|
|
* PIPE_FRAME_LOW_SHIFT);
|
|
|
|
* high2 = ((INREG(PIPEAFRAMEHIGH) & PIPE_FRAME_HIGH_MASK) >>
|
|
|
|
* PIPE_FRAME_HIGH_SHIFT);
|
|
|
|
* } while (high1 != high2);
|
|
|
|
* frame = (high1 << 8) | low1;
|
|
|
|
*/
|
2013-10-11 19:24:41 +00:00
|
|
|
#define _PIPEAFRAMEHIGH 0x70040
|
2008-07-29 18:54:06 +00:00
|
|
|
#define PIPE_FRAME_HIGH_MASK 0x0000ffff
|
|
|
|
#define PIPE_FRAME_HIGH_SHIFT 0
|
2013-10-11 19:24:41 +00:00
|
|
|
#define _PIPEAFRAMEPIXEL 0x70044
|
2008-07-29 18:54:06 +00:00
|
|
|
#define PIPE_FRAME_LOW_MASK 0xff000000
|
|
|
|
#define PIPE_FRAME_LOW_SHIFT 24
|
|
|
|
#define PIPE_PIXEL_MASK 0x00ffffff
|
|
|
|
#define PIPE_PIXEL_SHIFT 0
|
2009-02-06 18:22:41 +00:00
|
|
|
/* GM45+ just has to be different */
|
2015-09-18 17:03:42 +00:00
|
|
|
#define _PIPEA_FRMCOUNT_G4X 0x70040
|
|
|
|
#define _PIPEA_FLIPCOUNT_G4X 0x70044
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define PIPE_FRMCOUNT_G4X(pipe) _MMIO_PIPE2(pipe, _PIPEA_FRMCOUNT_G4X)
|
|
|
|
#define PIPE_FLIPCOUNT_G4X(pipe) _MMIO_PIPE2(pipe, _PIPEA_FLIPCOUNT_G4X)
|
2008-07-29 18:54:06 +00:00
|
|
|
|
|
|
|
/* Cursor A & B regs */
|
2014-04-09 10:28:53 +00:00
|
|
|
#define _CURACNTR 0x70080
|
2009-05-20 20:47:08 +00:00
|
|
|
/* Old style CUR*CNTR flags (desktop 8xx) */
|
|
|
|
#define CURSOR_ENABLE 0x80000000
|
|
|
|
#define CURSOR_GAMMA_ENABLE 0x40000000
|
2014-08-13 08:57:05 +00:00
|
|
|
#define CURSOR_STRIDE_SHIFT 28
|
|
|
|
#define CURSOR_STRIDE(x) ((ffs(x)-9) << CURSOR_STRIDE_SHIFT) /* 256,512,1k,2k */
|
2013-01-18 17:11:38 +00:00
|
|
|
#define CURSOR_PIPE_CSC_ENABLE (1<<24)
|
2009-05-20 20:47:08 +00:00
|
|
|
#define CURSOR_FORMAT_SHIFT 24
|
|
|
|
#define CURSOR_FORMAT_MASK (0x07 << CURSOR_FORMAT_SHIFT)
|
|
|
|
#define CURSOR_FORMAT_2C (0x00 << CURSOR_FORMAT_SHIFT)
|
|
|
|
#define CURSOR_FORMAT_3C (0x01 << CURSOR_FORMAT_SHIFT)
|
|
|
|
#define CURSOR_FORMAT_4C (0x02 << CURSOR_FORMAT_SHIFT)
|
|
|
|
#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
|
2008-07-29 18:54:06 +00:00
|
|
|
#define CURSOR_MODE_DISABLE 0x00
|
2014-03-10 11:36:23 +00:00
|
|
|
#define CURSOR_MODE_128_32B_AX 0x02
|
|
|
|
#define CURSOR_MODE_256_32B_AX 0x03
|
2008-07-29 18:54:06 +00:00
|
|
|
#define CURSOR_MODE_64_32B_AX 0x07
|
2014-03-10 11:36:23 +00:00
|
|
|
#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)
|
2008-07-29 18:54:06 +00:00
|
|
|
#define CURSOR_MODE_64_ARGB_AX ((1 << 5) | CURSOR_MODE_64_32B_AX)
|
2009-05-20 20:47:08 +00:00
|
|
|
#define MCURSOR_PIPE_SELECT (1 << 28)
|
|
|
|
#define MCURSOR_PIPE_A 0x00
|
|
|
|
#define MCURSOR_PIPE_B (1 << 28)
|
2008-07-29 18:54:06 +00:00
|
|
|
#define MCURSOR_GAMMA_ENABLE (1 << 26)
|
2014-10-23 14:41:34 +00:00
|
|
|
#define CURSOR_ROTATE_180 (1<<15)
|
2013-08-23 22:51:28 +00:00
|
|
|
#define CURSOR_TRICKLE_FEED_DISABLE (1 << 14)
|
2014-04-09 10:28:53 +00:00
|
|
|
#define _CURABASE 0x70084
|
|
|
|
#define _CURAPOS 0x70088
|
2008-07-29 18:54:06 +00:00
|
|
|
#define CURSOR_POS_MASK 0x007FF
|
|
|
|
#define CURSOR_POS_SIGN 0x8000
|
|
|
|
#define CURSOR_X_SHIFT 0
|
|
|
|
#define CURSOR_Y_SHIFT 16
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define CURSIZE _MMIO(0x700a0)
|
2014-04-09 10:28:53 +00:00
|
|
|
#define _CURBCNTR 0x700c0
|
|
|
|
#define _CURBBASE 0x700c4
|
|
|
|
#define _CURBPOS 0x700c8
|
2008-07-29 18:54:06 +00:00
|
|
|
|
2011-10-12 18:10:21 +00:00
|
|
|
#define _CURBCNTR_IVB 0x71080
|
|
|
|
#define _CURBBASE_IVB 0x71084
|
|
|
|
#define _CURBPOS_IVB 0x71088
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define _CURSOR2(pipe, reg) _MMIO(dev_priv->info.cursor_offsets[(pipe)] - \
|
2014-04-09 10:28:53 +00:00
|
|
|
dev_priv->info.cursor_offsets[PIPE_A] + (reg) + \
|
|
|
|
dev_priv->info.display_mmio_offset)
|
|
|
|
|
|
|
|
#define CURCNTR(pipe) _CURSOR2(pipe, _CURACNTR)
|
|
|
|
#define CURBASE(pipe) _CURSOR2(pipe, _CURABASE)
|
|
|
|
#define CURPOS(pipe) _CURSOR2(pipe, _CURAPOS)
|
2010-11-21 13:12:35 +00:00
|
|
|
|
2014-04-09 10:28:53 +00:00
|
|
|
#define CURSOR_A_OFFSET 0x70080
|
|
|
|
#define CURSOR_B_OFFSET 0x700c0
|
|
|
|
#define CHV_CURSOR_C_OFFSET 0x700e0
|
|
|
|
#define IVB_CURSOR_B_OFFSET 0x71080
|
|
|
|
#define IVB_CURSOR_C_OFFSET 0x72080
|
2011-10-12 18:10:21 +00:00
|
|
|
|
2008-07-29 18:54:06 +00:00
|
|
|
/* Display A control */
|
drm/i915: Reorganize display pipe register accesses
RFCv2: Reorganize array indexing so that full offsets can be used as
is. It makes grepping for registers in i915_reg.h much easier. Also
move offset arrays to intel_device_info.
v1: Fixed offsets for VLV, proper eDP handling
v2: Fixed BCLRPAT, PIPESRC, PIPECONF and DSP* macros.
v3: Added EDP pipe comment, removed redundant offset arrays for
MSA_MISC and DDI_FUNC_CTL.
v4: Rename patch and report object size increase.
v5: Change location of commas, add PIPE_EDP into enum pipe
v6: Insert PIPE_EDP_OFFSET into pipe offset array
v7: Set I915_MAX_PIPES back to 3, change more registers accessors
to use the new macros, get rid of _PIPE_INC and add dev_priv
as a parameter where required by the new macros.
Upcoming hardware will not have the various display pipe register
ranges evenly spaced in memory. Change register address calculations
into array lookups.
Tested on SNB, VLV, IVB, Gen2 and HSW w/eDP.
I left the UMS cruft untouched.
Size differences:
text data bss dec hex filename
596431 4634 56 601121 92c21 i915.ko (new)
593199 4634 56 597889 91f81 i915.ko (old)
Signed-off-by: Antti Koskipaa <antti.koskipaa@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Tested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-02-04 12:22:24 +00:00
|
|
|
#define _DSPACNTR 0x70180
|
2008-07-29 18:54:06 +00:00
|
|
|
#define DISPLAY_PLANE_ENABLE (1<<31)
|
|
|
|
#define DISPLAY_PLANE_DISABLE 0
|
|
|
|
#define DISPPLANE_GAMMA_ENABLE (1<<30)
|
|
|
|
#define DISPPLANE_GAMMA_DISABLE 0
|
|
|
|
#define DISPPLANE_PIXFORMAT_MASK (0xf<<26)
|
2012-10-31 15:50:14 +00:00
|
|
|
#define DISPPLANE_YUV422 (0x0<<26)
|
2008-07-29 18:54:06 +00:00
|
|
|
#define DISPPLANE_8BPP (0x2<<26)
|
2012-10-31 15:50:14 +00:00
|
|
|
#define DISPPLANE_BGRA555 (0x3<<26)
|
|
|
|
#define DISPPLANE_BGRX555 (0x4<<26)
|
|
|
|
#define DISPPLANE_BGRX565 (0x5<<26)
|
|
|
|
#define DISPPLANE_BGRX888 (0x6<<26)
|
|
|
|
#define DISPPLANE_BGRA888 (0x7<<26)
|
|
|
|
#define DISPPLANE_RGBX101010 (0x8<<26)
|
|
|
|
#define DISPPLANE_RGBA101010 (0x9<<26)
|
|
|
|
#define DISPPLANE_BGRX101010 (0xa<<26)
|
|
|
|
#define DISPPLANE_RGBX161616 (0xc<<26)
|
|
|
|
#define DISPPLANE_RGBX888 (0xe<<26)
|
|
|
|
#define DISPPLANE_RGBA888 (0xf<<26)
|
2008-07-29 18:54:06 +00:00
|
|
|
#define DISPPLANE_STEREO_ENABLE (1<<25)
|
|
|
|
#define DISPPLANE_STEREO_DISABLE 0
|
2013-01-18 17:11:38 +00:00
|
|
|
#define DISPPLANE_PIPE_CSC_ENABLE (1<<24)
|
2011-01-04 23:09:30 +00:00
|
|
|
#define DISPPLANE_SEL_PIPE_SHIFT 24
|
|
|
|
#define DISPPLANE_SEL_PIPE_MASK (3<<DISPPLANE_SEL_PIPE_SHIFT)
|
2008-07-29 18:54:06 +00:00
|
|
|
#define DISPPLANE_SEL_PIPE_A 0
|
2011-01-04 23:09:30 +00:00
|
|
|
#define DISPPLANE_SEL_PIPE_B (1<<DISPPLANE_SEL_PIPE_SHIFT)
|
2008-07-29 18:54:06 +00:00
|
|
|
#define DISPPLANE_SRC_KEY_ENABLE (1<<22)
|
|
|
|
#define DISPPLANE_SRC_KEY_DISABLE 0
|
|
|
|
#define DISPPLANE_LINE_DOUBLE (1<<20)
|
|
|
|
#define DISPPLANE_NO_LINE_DOUBLE 0
|
|
|
|
#define DISPPLANE_STEREO_POLARITY_FIRST 0
|
|
|
|
#define DISPPLANE_STEREO_POLARITY_SECOND (1<<18)
|
2014-10-16 17:52:34 +00:00
|
|
|
#define DISPPLANE_ALPHA_PREMULTIPLY (1<<16) /* CHV pipe B */
|
|
|
|
#define DISPPLANE_ROTATE_180 (1<<15)
|
2009-12-03 22:14:42 +00:00
|
|
|
#define DISPPLANE_TRICKLE_FEED_DISABLE (1<<14) /* Ironlake */
|
2009-04-14 21:17:47 +00:00
|
|
|
#define DISPPLANE_TILED (1<<10)
|
2014-10-16 17:52:34 +00:00
|
|
|
#define DISPPLANE_MIRROR (1<<8) /* CHV pipe B */
|
drm/i915: Reorganize display pipe register accesses
RFCv2: Reorganize array indexing so that full offsets can be used as
is. It makes grepping for registers in i915_reg.h much easier. Also
move offset arrays to intel_device_info.
v1: Fixed offsets for VLV, proper eDP handling
v2: Fixed BCLRPAT, PIPESRC, PIPECONF and DSP* macros.
v3: Added EDP pipe comment, removed redundant offset arrays for
MSA_MISC and DDI_FUNC_CTL.
v4: Rename patch and report object size increase.
v5: Change location of commas, add PIPE_EDP into enum pipe
v6: Insert PIPE_EDP_OFFSET into pipe offset array
v7: Set I915_MAX_PIPES back to 3, change more registers accessors
to use the new macros, get rid of _PIPE_INC and add dev_priv
as a parameter where required by the new macros.
Upcoming hardware will not have the various display pipe register
ranges evenly spaced in memory. Change register address calculations
into array lookups.
Tested on SNB, VLV, IVB, Gen2 and HSW w/eDP.
I left the UMS cruft untouched.
Size differences:
text data bss dec hex filename
596431 4634 56 601121 92c21 i915.ko (new)
593199 4634 56 597889 91f81 i915.ko (old)
Signed-off-by: Antti Koskipaa <antti.koskipaa@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Tested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-02-04 12:22:24 +00:00
|
|
|
#define _DSPAADDR 0x70184
|
|
|
|
#define _DSPASTRIDE 0x70188
|
|
|
|
#define _DSPAPOS 0x7018C /* reserved */
|
|
|
|
#define _DSPASIZE 0x70190
|
|
|
|
#define _DSPASURF 0x7019C /* 965+ only */
|
|
|
|
#define _DSPATILEOFF 0x701A4 /* 965+ only */
|
|
|
|
#define _DSPAOFFSET 0x701A4 /* HSW */
|
|
|
|
#define _DSPASURFLIVE 0x701AC
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define DSPCNTR(plane) _MMIO_PIPE2(plane, _DSPACNTR)
|
|
|
|
#define DSPADDR(plane) _MMIO_PIPE2(plane, _DSPAADDR)
|
|
|
|
#define DSPSTRIDE(plane) _MMIO_PIPE2(plane, _DSPASTRIDE)
|
|
|
|
#define DSPPOS(plane) _MMIO_PIPE2(plane, _DSPAPOS)
|
|
|
|
#define DSPSIZE(plane) _MMIO_PIPE2(plane, _DSPASIZE)
|
|
|
|
#define DSPSURF(plane) _MMIO_PIPE2(plane, _DSPASURF)
|
|
|
|
#define DSPTILEOFF(plane) _MMIO_PIPE2(plane, _DSPATILEOFF)
|
|
|
|
#define DSPLINOFF(plane) DSPADDR(plane)
|
|
|
|
#define DSPOFFSET(plane) _MMIO_PIPE2(plane, _DSPAOFFSET)
|
|
|
|
#define DSPSURFLIVE(plane) _MMIO_PIPE2(plane, _DSPASURFLIVE)
|
2010-09-11 12:48:45 +00:00
|
|
|
|
2014-10-16 17:52:34 +00:00
|
|
|
/* CHV pipe B blender and primary plane */
|
|
|
|
#define _CHV_BLEND_A 0x60a00
|
|
|
|
#define CHV_BLEND_LEGACY (0<<30)
|
|
|
|
#define CHV_BLEND_ANDROID (1<<30)
|
|
|
|
#define CHV_BLEND_MPO (2<<30)
|
|
|
|
#define CHV_BLEND_MASK (3<<30)
|
|
|
|
#define _CHV_CANVAS_A 0x60a04
|
|
|
|
#define _PRIMPOS_A 0x60a08
|
|
|
|
#define _PRIMSIZE_A 0x60a0c
|
|
|
|
#define _PRIMCNSTALPHA_A 0x60a10
|
|
|
|
#define PRIM_CONST_ALPHA_ENABLE (1<<31)
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define CHV_BLEND(pipe) _MMIO_TRANS2(pipe, _CHV_BLEND_A)
|
|
|
|
#define CHV_CANVAS(pipe) _MMIO_TRANS2(pipe, _CHV_CANVAS_A)
|
|
|
|
#define PRIMPOS(plane) _MMIO_TRANS2(plane, _PRIMPOS_A)
|
|
|
|
#define PRIMSIZE(plane) _MMIO_TRANS2(plane, _PRIMSIZE_A)
|
|
|
|
#define PRIMCNSTALPHA(plane) _MMIO_TRANS2(plane, _PRIMCNSTALPHA_A)
|
2014-10-16 17:52:34 +00:00
|
|
|
|
2012-03-30 23:20:16 +00:00
|
|
|
/* Display/Sprite base address macros */
|
|
|
|
#define DISP_BASEADDR_MASK (0xfffff000)
|
|
|
|
#define I915_LO_DISPBASE(val) (val & ~DISP_BASEADDR_MASK)
|
|
|
|
#define I915_HI_DISPBASE(val) (val & DISP_BASEADDR_MASK)
|
|
|
|
|
2015-09-18 17:03:43 +00:00
|
|
|
/*
|
|
|
|
* VBIOS flags
|
|
|
|
* gen2:
|
|
|
|
* [00:06] alm,mgm
|
|
|
|
* [10:16] all
|
|
|
|
* [30:32] alm,mgm
|
|
|
|
* gen3+:
|
|
|
|
* [00:0f] all
|
|
|
|
* [10:1f] all
|
|
|
|
* [30:32] all
|
|
|
|
*/
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define SWF0(i) _MMIO(dev_priv->info.display_mmio_offset + 0x70410 + (i) * 4)
|
|
|
|
#define SWF1(i) _MMIO(dev_priv->info.display_mmio_offset + 0x71410 + (i) * 4)
|
|
|
|
#define SWF3(i) _MMIO(dev_priv->info.display_mmio_offset + 0x72414 + (i) * 4)
|
|
|
|
#define SWF_ILK(i) _MMIO(0x4F000 + (i) * 4)
|
2008-07-29 18:54:06 +00:00
|
|
|
|
|
|
|
/* Pipe B */
|
2014-02-07 19:12:48 +00:00
|
|
|
#define _PIPEBDSL (dev_priv->info.display_mmio_offset + 0x71000)
|
|
|
|
#define _PIPEBCONF (dev_priv->info.display_mmio_offset + 0x71008)
|
|
|
|
#define _PIPEBSTAT (dev_priv->info.display_mmio_offset + 0x71024)
|
2013-10-11 19:24:41 +00:00
|
|
|
#define _PIPEBFRAMEHIGH 0x71040
|
|
|
|
#define _PIPEBFRAMEPIXEL 0x71044
|
2015-09-18 17:03:42 +00:00
|
|
|
#define _PIPEB_FRMCOUNT_G4X (dev_priv->info.display_mmio_offset + 0x71040)
|
|
|
|
#define _PIPEB_FLIPCOUNT_G4X (dev_priv->info.display_mmio_offset + 0x71044)
|
2009-02-06 18:22:41 +00:00
|
|
|
|
2008-07-29 18:54:06 +00:00
|
|
|
|
|
|
|
/* Display B control */
|
2014-02-07 19:12:48 +00:00
|
|
|
#define _DSPBCNTR (dev_priv->info.display_mmio_offset + 0x71180)
|
2008-07-29 18:54:06 +00:00
|
|
|
#define DISPPLANE_ALPHA_TRANS_ENABLE (1<<15)
|
|
|
|
#define DISPPLANE_ALPHA_TRANS_DISABLE 0
|
|
|
|
#define DISPPLANE_SPRITE_ABOVE_DISPLAY 0
|
|
|
|
#define DISPPLANE_SPRITE_ABOVE_OVERLAY (1)
|
2014-02-07 19:12:48 +00:00
|
|
|
#define _DSPBADDR (dev_priv->info.display_mmio_offset + 0x71184)
|
|
|
|
#define _DSPBSTRIDE (dev_priv->info.display_mmio_offset + 0x71188)
|
|
|
|
#define _DSPBPOS (dev_priv->info.display_mmio_offset + 0x7118C)
|
|
|
|
#define _DSPBSIZE (dev_priv->info.display_mmio_offset + 0x71190)
|
|
|
|
#define _DSPBSURF (dev_priv->info.display_mmio_offset + 0x7119C)
|
|
|
|
#define _DSPBTILEOFF (dev_priv->info.display_mmio_offset + 0x711A4)
|
|
|
|
#define _DSPBOFFSET (dev_priv->info.display_mmio_offset + 0x711A4)
|
|
|
|
#define _DSPBSURFLIVE (dev_priv->info.display_mmio_offset + 0x711AC)
|
2008-07-29 18:54:06 +00:00
|
|
|
|
2011-12-13 21:19:38 +00:00
|
|
|
/* Sprite A control */
|
|
|
|
#define _DVSACNTR 0x72180
|
|
|
|
#define DVS_ENABLE (1<<31)
|
|
|
|
#define DVS_GAMMA_ENABLE (1<<30)
|
|
|
|
#define DVS_PIXFORMAT_MASK (3<<25)
|
|
|
|
#define DVS_FORMAT_YUV422 (0<<25)
|
|
|
|
#define DVS_FORMAT_RGBX101010 (1<<25)
|
|
|
|
#define DVS_FORMAT_RGBX888 (2<<25)
|
|
|
|
#define DVS_FORMAT_RGBX161616 (3<<25)
|
2013-01-18 17:11:38 +00:00
|
|
|
#define DVS_PIPE_CSC_ENABLE (1<<24)
|
2011-12-13 21:19:38 +00:00
|
|
|
#define DVS_SOURCE_KEY (1<<22)
|
2012-02-27 20:40:10 +00:00
|
|
|
#define DVS_RGB_ORDER_XBGR (1<<20)
|
2011-12-13 21:19:38 +00:00
|
|
|
#define DVS_YUV_BYTE_ORDER_MASK (3<<16)
|
|
|
|
#define DVS_YUV_ORDER_YUYV (0<<16)
|
|
|
|
#define DVS_YUV_ORDER_UYVY (1<<16)
|
|
|
|
#define DVS_YUV_ORDER_YVYU (2<<16)
|
|
|
|
#define DVS_YUV_ORDER_VYUY (3<<16)
|
2014-08-05 05:56:52 +00:00
|
|
|
#define DVS_ROTATE_180 (1<<15)
|
2011-12-13 21:19:38 +00:00
|
|
|
#define DVS_DEST_KEY (1<<2)
|
|
|
|
#define DVS_TRICKLE_FEED_DISABLE (1<<14)
|
|
|
|
#define DVS_TILED (1<<10)
|
|
|
|
#define _DVSALINOFF 0x72184
|
|
|
|
#define _DVSASTRIDE 0x72188
|
|
|
|
#define _DVSAPOS 0x7218c
|
|
|
|
#define _DVSASIZE 0x72190
|
|
|
|
#define _DVSAKEYVAL 0x72194
|
|
|
|
#define _DVSAKEYMSK 0x72198
|
|
|
|
#define _DVSASURF 0x7219c
|
|
|
|
#define _DVSAKEYMAXVAL 0x721a0
|
|
|
|
#define _DVSATILEOFF 0x721a4
|
|
|
|
#define _DVSASURFLIVE 0x721ac
|
|
|
|
#define _DVSASCALE 0x72204
|
|
|
|
#define DVS_SCALE_ENABLE (1<<31)
|
|
|
|
#define DVS_FILTER_MASK (3<<29)
|
|
|
|
#define DVS_FILTER_MEDIUM (0<<29)
|
|
|
|
#define DVS_FILTER_ENHANCING (1<<29)
|
|
|
|
#define DVS_FILTER_SOFTENING (2<<29)
|
|
|
|
#define DVS_VERTICAL_OFFSET_HALF (1<<28) /* must be enabled below */
|
|
|
|
#define DVS_VERTICAL_OFFSET_ENABLE (1<<27)
|
|
|
|
#define _DVSAGAMC 0x72300
|
|
|
|
|
|
|
|
#define _DVSBCNTR 0x73180
|
|
|
|
#define _DVSBLINOFF 0x73184
|
|
|
|
#define _DVSBSTRIDE 0x73188
|
|
|
|
#define _DVSBPOS 0x7318c
|
|
|
|
#define _DVSBSIZE 0x73190
|
|
|
|
#define _DVSBKEYVAL 0x73194
|
|
|
|
#define _DVSBKEYMSK 0x73198
|
|
|
|
#define _DVSBSURF 0x7319c
|
|
|
|
#define _DVSBKEYMAXVAL 0x731a0
|
|
|
|
#define _DVSBTILEOFF 0x731a4
|
|
|
|
#define _DVSBSURFLIVE 0x731ac
|
|
|
|
#define _DVSBSCALE 0x73204
|
|
|
|
#define _DVSBGAMC 0x73300
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define DVSCNTR(pipe) _MMIO_PIPE(pipe, _DVSACNTR, _DVSBCNTR)
|
|
|
|
#define DVSLINOFF(pipe) _MMIO_PIPE(pipe, _DVSALINOFF, _DVSBLINOFF)
|
|
|
|
#define DVSSTRIDE(pipe) _MMIO_PIPE(pipe, _DVSASTRIDE, _DVSBSTRIDE)
|
|
|
|
#define DVSPOS(pipe) _MMIO_PIPE(pipe, _DVSAPOS, _DVSBPOS)
|
|
|
|
#define DVSSURF(pipe) _MMIO_PIPE(pipe, _DVSASURF, _DVSBSURF)
|
|
|
|
#define DVSKEYMAX(pipe) _MMIO_PIPE(pipe, _DVSAKEYMAXVAL, _DVSBKEYMAXVAL)
|
|
|
|
#define DVSSIZE(pipe) _MMIO_PIPE(pipe, _DVSASIZE, _DVSBSIZE)
|
|
|
|
#define DVSSCALE(pipe) _MMIO_PIPE(pipe, _DVSASCALE, _DVSBSCALE)
|
|
|
|
#define DVSTILEOFF(pipe) _MMIO_PIPE(pipe, _DVSATILEOFF, _DVSBTILEOFF)
|
|
|
|
#define DVSKEYVAL(pipe) _MMIO_PIPE(pipe, _DVSAKEYVAL, _DVSBKEYVAL)
|
|
|
|
#define DVSKEYMSK(pipe) _MMIO_PIPE(pipe, _DVSAKEYMSK, _DVSBKEYMSK)
|
|
|
|
#define DVSSURFLIVE(pipe) _MMIO_PIPE(pipe, _DVSASURFLIVE, _DVSBSURFLIVE)
|
2011-12-13 21:19:38 +00:00
|
|
|
|
|
|
|
#define _SPRA_CTL 0x70280
|
|
|
|
#define SPRITE_ENABLE (1<<31)
|
|
|
|
#define SPRITE_GAMMA_ENABLE (1<<30)
|
|
|
|
#define SPRITE_PIXFORMAT_MASK (7<<25)
|
|
|
|
#define SPRITE_FORMAT_YUV422 (0<<25)
|
|
|
|
#define SPRITE_FORMAT_RGBX101010 (1<<25)
|
|
|
|
#define SPRITE_FORMAT_RGBX888 (2<<25)
|
|
|
|
#define SPRITE_FORMAT_RGBX161616 (3<<25)
|
|
|
|
#define SPRITE_FORMAT_YUV444 (4<<25)
|
|
|
|
#define SPRITE_FORMAT_XR_BGR101010 (5<<25) /* Extended range */
|
2013-01-18 17:11:38 +00:00
|
|
|
#define SPRITE_PIPE_CSC_ENABLE (1<<24)
|
2011-12-13 21:19:38 +00:00
|
|
|
#define SPRITE_SOURCE_KEY (1<<22)
|
|
|
|
#define SPRITE_RGB_ORDER_RGBX (1<<20) /* only for 888 and 161616 */
|
|
|
|
#define SPRITE_YUV_TO_RGB_CSC_DISABLE (1<<19)
|
|
|
|
#define SPRITE_YUV_CSC_FORMAT_BT709 (1<<18) /* 0 is BT601 */
|
|
|
|
#define SPRITE_YUV_BYTE_ORDER_MASK (3<<16)
|
|
|
|
#define SPRITE_YUV_ORDER_YUYV (0<<16)
|
|
|
|
#define SPRITE_YUV_ORDER_UYVY (1<<16)
|
|
|
|
#define SPRITE_YUV_ORDER_YVYU (2<<16)
|
|
|
|
#define SPRITE_YUV_ORDER_VYUY (3<<16)
|
2014-08-05 05:56:52 +00:00
|
|
|
#define SPRITE_ROTATE_180 (1<<15)
|
2011-12-13 21:19:38 +00:00
|
|
|
#define SPRITE_TRICKLE_FEED_DISABLE (1<<14)
|
|
|
|
#define SPRITE_INT_GAMMA_ENABLE (1<<13)
|
|
|
|
#define SPRITE_TILED (1<<10)
|
|
|
|
#define SPRITE_DEST_KEY (1<<2)
|
|
|
|
#define _SPRA_LINOFF 0x70284
|
|
|
|
#define _SPRA_STRIDE 0x70288
|
|
|
|
#define _SPRA_POS 0x7028c
|
|
|
|
#define _SPRA_SIZE 0x70290
|
|
|
|
#define _SPRA_KEYVAL 0x70294
|
|
|
|
#define _SPRA_KEYMSK 0x70298
|
|
|
|
#define _SPRA_SURF 0x7029c
|
|
|
|
#define _SPRA_KEYMAX 0x702a0
|
|
|
|
#define _SPRA_TILEOFF 0x702a4
|
2012-10-26 17:20:11 +00:00
|
|
|
#define _SPRA_OFFSET 0x702a4
|
2012-11-01 17:26:45 +00:00
|
|
|
#define _SPRA_SURFLIVE 0x702ac
|
2011-12-13 21:19:38 +00:00
|
|
|
#define _SPRA_SCALE 0x70304
|
|
|
|
#define SPRITE_SCALE_ENABLE (1<<31)
|
|
|
|
#define SPRITE_FILTER_MASK (3<<29)
|
|
|
|
#define SPRITE_FILTER_MEDIUM (0<<29)
|
|
|
|
#define SPRITE_FILTER_ENHANCING (1<<29)
|
|
|
|
#define SPRITE_FILTER_SOFTENING (2<<29)
|
|
|
|
#define SPRITE_VERTICAL_OFFSET_HALF (1<<28) /* must be enabled below */
|
|
|
|
#define SPRITE_VERTICAL_OFFSET_ENABLE (1<<27)
|
|
|
|
#define _SPRA_GAMC 0x70400
|
|
|
|
|
|
|
|
#define _SPRB_CTL 0x71280
|
|
|
|
#define _SPRB_LINOFF 0x71284
|
|
|
|
#define _SPRB_STRIDE 0x71288
|
|
|
|
#define _SPRB_POS 0x7128c
|
|
|
|
#define _SPRB_SIZE 0x71290
|
|
|
|
#define _SPRB_KEYVAL 0x71294
|
|
|
|
#define _SPRB_KEYMSK 0x71298
|
|
|
|
#define _SPRB_SURF 0x7129c
|
|
|
|
#define _SPRB_KEYMAX 0x712a0
|
|
|
|
#define _SPRB_TILEOFF 0x712a4
|
2012-10-26 17:20:11 +00:00
|
|
|
#define _SPRB_OFFSET 0x712a4
|
2012-11-01 17:26:45 +00:00
|
|
|
#define _SPRB_SURFLIVE 0x712ac
|
2011-12-13 21:19:38 +00:00
|
|
|
#define _SPRB_SCALE 0x71304
|
|
|
|
#define _SPRB_GAMC 0x71400
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define SPRCTL(pipe) _MMIO_PIPE(pipe, _SPRA_CTL, _SPRB_CTL)
|
|
|
|
#define SPRLINOFF(pipe) _MMIO_PIPE(pipe, _SPRA_LINOFF, _SPRB_LINOFF)
|
|
|
|
#define SPRSTRIDE(pipe) _MMIO_PIPE(pipe, _SPRA_STRIDE, _SPRB_STRIDE)
|
|
|
|
#define SPRPOS(pipe) _MMIO_PIPE(pipe, _SPRA_POS, _SPRB_POS)
|
|
|
|
#define SPRSIZE(pipe) _MMIO_PIPE(pipe, _SPRA_SIZE, _SPRB_SIZE)
|
|
|
|
#define SPRKEYVAL(pipe) _MMIO_PIPE(pipe, _SPRA_KEYVAL, _SPRB_KEYVAL)
|
|
|
|
#define SPRKEYMSK(pipe) _MMIO_PIPE(pipe, _SPRA_KEYMSK, _SPRB_KEYMSK)
|
|
|
|
#define SPRSURF(pipe) _MMIO_PIPE(pipe, _SPRA_SURF, _SPRB_SURF)
|
|
|
|
#define SPRKEYMAX(pipe) _MMIO_PIPE(pipe, _SPRA_KEYMAX, _SPRB_KEYMAX)
|
|
|
|
#define SPRTILEOFF(pipe) _MMIO_PIPE(pipe, _SPRA_TILEOFF, _SPRB_TILEOFF)
|
|
|
|
#define SPROFFSET(pipe) _MMIO_PIPE(pipe, _SPRA_OFFSET, _SPRB_OFFSET)
|
|
|
|
#define SPRSCALE(pipe) _MMIO_PIPE(pipe, _SPRA_SCALE, _SPRB_SCALE)
|
|
|
|
#define SPRGAMC(pipe) _MMIO_PIPE(pipe, _SPRA_GAMC, _SPRB_GAMC)
|
|
|
|
#define SPRSURFLIVE(pipe) _MMIO_PIPE(pipe, _SPRA_SURFLIVE, _SPRB_SURFLIVE)
|
2011-12-13 21:19:38 +00:00
|
|
|
|
2013-06-25 11:16:35 +00:00
|
|
|
#define _SPACNTR (VLV_DISPLAY_BASE + 0x72180)
|
2013-04-02 18:22:20 +00:00
|
|
|
#define SP_ENABLE (1<<31)
|
2013-11-19 02:32:38 +00:00
|
|
|
#define SP_GAMMA_ENABLE (1<<30)
|
2013-04-02 18:22:20 +00:00
|
|
|
#define SP_PIXFORMAT_MASK (0xf<<26)
|
|
|
|
#define SP_FORMAT_YUV422 (0<<26)
|
|
|
|
#define SP_FORMAT_BGR565 (5<<26)
|
|
|
|
#define SP_FORMAT_BGRX8888 (6<<26)
|
|
|
|
#define SP_FORMAT_BGRA8888 (7<<26)
|
|
|
|
#define SP_FORMAT_RGBX1010102 (8<<26)
|
|
|
|
#define SP_FORMAT_RGBA1010102 (9<<26)
|
|
|
|
#define SP_FORMAT_RGBX8888 (0xe<<26)
|
|
|
|
#define SP_FORMAT_RGBA8888 (0xf<<26)
|
2014-10-16 17:52:34 +00:00
|
|
|
#define SP_ALPHA_PREMULTIPLY (1<<23) /* CHV pipe B */
|
2013-04-02 18:22:20 +00:00
|
|
|
#define SP_SOURCE_KEY (1<<22)
|
|
|
|
#define SP_YUV_BYTE_ORDER_MASK (3<<16)
|
|
|
|
#define SP_YUV_ORDER_YUYV (0<<16)
|
|
|
|
#define SP_YUV_ORDER_UYVY (1<<16)
|
|
|
|
#define SP_YUV_ORDER_YVYU (2<<16)
|
|
|
|
#define SP_YUV_ORDER_VYUY (3<<16)
|
2014-08-05 05:56:52 +00:00
|
|
|
#define SP_ROTATE_180 (1<<15)
|
2013-04-02 18:22:20 +00:00
|
|
|
#define SP_TILED (1<<10)
|
2014-10-16 17:52:34 +00:00
|
|
|
#define SP_MIRROR (1<<8) /* CHV pipe B */
|
2013-06-25 11:16:35 +00:00
|
|
|
#define _SPALINOFF (VLV_DISPLAY_BASE + 0x72184)
|
|
|
|
#define _SPASTRIDE (VLV_DISPLAY_BASE + 0x72188)
|
|
|
|
#define _SPAPOS (VLV_DISPLAY_BASE + 0x7218c)
|
|
|
|
#define _SPASIZE (VLV_DISPLAY_BASE + 0x72190)
|
|
|
|
#define _SPAKEYMINVAL (VLV_DISPLAY_BASE + 0x72194)
|
|
|
|
#define _SPAKEYMSK (VLV_DISPLAY_BASE + 0x72198)
|
|
|
|
#define _SPASURF (VLV_DISPLAY_BASE + 0x7219c)
|
|
|
|
#define _SPAKEYMAXVAL (VLV_DISPLAY_BASE + 0x721a0)
|
|
|
|
#define _SPATILEOFF (VLV_DISPLAY_BASE + 0x721a4)
|
|
|
|
#define _SPACONSTALPHA (VLV_DISPLAY_BASE + 0x721a8)
|
2014-10-16 17:52:34 +00:00
|
|
|
#define SP_CONST_ALPHA_ENABLE (1<<31)
|
2013-06-25 11:16:35 +00:00
|
|
|
#define _SPAGAMC (VLV_DISPLAY_BASE + 0x721f4)
|
|
|
|
|
|
|
|
#define _SPBCNTR (VLV_DISPLAY_BASE + 0x72280)
|
|
|
|
#define _SPBLINOFF (VLV_DISPLAY_BASE + 0x72284)
|
|
|
|
#define _SPBSTRIDE (VLV_DISPLAY_BASE + 0x72288)
|
|
|
|
#define _SPBPOS (VLV_DISPLAY_BASE + 0x7228c)
|
|
|
|
#define _SPBSIZE (VLV_DISPLAY_BASE + 0x72290)
|
|
|
|
#define _SPBKEYMINVAL (VLV_DISPLAY_BASE + 0x72294)
|
|
|
|
#define _SPBKEYMSK (VLV_DISPLAY_BASE + 0x72298)
|
|
|
|
#define _SPBSURF (VLV_DISPLAY_BASE + 0x7229c)
|
|
|
|
#define _SPBKEYMAXVAL (VLV_DISPLAY_BASE + 0x722a0)
|
|
|
|
#define _SPBTILEOFF (VLV_DISPLAY_BASE + 0x722a4)
|
|
|
|
#define _SPBCONSTALPHA (VLV_DISPLAY_BASE + 0x722a8)
|
|
|
|
#define _SPBGAMC (VLV_DISPLAY_BASE + 0x722f4)
|
2013-04-02 18:22:20 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define SPCNTR(pipe, plane) _MMIO_PIPE((pipe) * 2 + (plane), _SPACNTR, _SPBCNTR)
|
|
|
|
#define SPLINOFF(pipe, plane) _MMIO_PIPE((pipe) * 2 + (plane), _SPALINOFF, _SPBLINOFF)
|
|
|
|
#define SPSTRIDE(pipe, plane) _MMIO_PIPE((pipe) * 2 + (plane), _SPASTRIDE, _SPBSTRIDE)
|
|
|
|
#define SPPOS(pipe, plane) _MMIO_PIPE((pipe) * 2 + (plane), _SPAPOS, _SPBPOS)
|
|
|
|
#define SPSIZE(pipe, plane) _MMIO_PIPE((pipe) * 2 + (plane), _SPASIZE, _SPBSIZE)
|
|
|
|
#define SPKEYMINVAL(pipe, plane) _MMIO_PIPE((pipe) * 2 + (plane), _SPAKEYMINVAL, _SPBKEYMINVAL)
|
|
|
|
#define SPKEYMSK(pipe, plane) _MMIO_PIPE((pipe) * 2 + (plane), _SPAKEYMSK, _SPBKEYMSK)
|
|
|
|
#define SPSURF(pipe, plane) _MMIO_PIPE((pipe) * 2 + (plane), _SPASURF, _SPBSURF)
|
|
|
|
#define SPKEYMAXVAL(pipe, plane) _MMIO_PIPE((pipe) * 2 + (plane), _SPAKEYMAXVAL, _SPBKEYMAXVAL)
|
|
|
|
#define SPTILEOFF(pipe, plane) _MMIO_PIPE((pipe) * 2 + (plane), _SPATILEOFF, _SPBTILEOFF)
|
|
|
|
#define SPCONSTALPHA(pipe, plane) _MMIO_PIPE((pipe) * 2 + (plane), _SPACONSTALPHA, _SPBCONSTALPHA)
|
|
|
|
#define SPGAMC(pipe, plane) _MMIO_PIPE((pipe) * 2 + (plane), _SPAGAMC, _SPBGAMC)
|
2013-04-02 18:22:20 +00:00
|
|
|
|
2014-10-20 16:47:53 +00:00
|
|
|
/*
|
|
|
|
* CHV pipe B sprite CSC
|
|
|
|
*
|
|
|
|
* |cr| |c0 c1 c2| |cr + cr_ioff| |cr_ooff|
|
|
|
|
* |yg| = |c3 c4 c5| x |yg + yg_ioff| + |yg_ooff|
|
|
|
|
* |cb| |c6 c7 c8| |cb + cr_ioff| |cb_ooff|
|
|
|
|
*/
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define SPCSCYGOFF(sprite) _MMIO(VLV_DISPLAY_BASE + 0x6d900 + (sprite) * 0x1000)
|
|
|
|
#define SPCSCCBOFF(sprite) _MMIO(VLV_DISPLAY_BASE + 0x6d904 + (sprite) * 0x1000)
|
|
|
|
#define SPCSCCROFF(sprite) _MMIO(VLV_DISPLAY_BASE + 0x6d908 + (sprite) * 0x1000)
|
2014-10-20 16:47:53 +00:00
|
|
|
#define SPCSC_OOFF(x) (((x) & 0x7ff) << 16) /* s11 */
|
|
|
|
#define SPCSC_IOFF(x) (((x) & 0x7ff) << 0) /* s11 */
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define SPCSCC01(sprite) _MMIO(VLV_DISPLAY_BASE + 0x6d90c + (sprite) * 0x1000)
|
|
|
|
#define SPCSCC23(sprite) _MMIO(VLV_DISPLAY_BASE + 0x6d910 + (sprite) * 0x1000)
|
|
|
|
#define SPCSCC45(sprite) _MMIO(VLV_DISPLAY_BASE + 0x6d914 + (sprite) * 0x1000)
|
|
|
|
#define SPCSCC67(sprite) _MMIO(VLV_DISPLAY_BASE + 0x6d918 + (sprite) * 0x1000)
|
|
|
|
#define SPCSCC8(sprite) _MMIO(VLV_DISPLAY_BASE + 0x6d91c + (sprite) * 0x1000)
|
2014-10-20 16:47:53 +00:00
|
|
|
#define SPCSC_C1(x) (((x) & 0x7fff) << 16) /* s3.12 */
|
|
|
|
#define SPCSC_C0(x) (((x) & 0x7fff) << 0) /* s3.12 */
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define SPCSCYGICLAMP(sprite) _MMIO(VLV_DISPLAY_BASE + 0x6d920 + (sprite) * 0x1000)
|
|
|
|
#define SPCSCCBICLAMP(sprite) _MMIO(VLV_DISPLAY_BASE + 0x6d924 + (sprite) * 0x1000)
|
|
|
|
#define SPCSCCRICLAMP(sprite) _MMIO(VLV_DISPLAY_BASE + 0x6d928 + (sprite) * 0x1000)
|
2014-10-20 16:47:53 +00:00
|
|
|
#define SPCSC_IMAX(x) (((x) & 0x7ff) << 16) /* s11 */
|
|
|
|
#define SPCSC_IMIN(x) (((x) & 0x7ff) << 0) /* s11 */
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define SPCSCYGOCLAMP(sprite) _MMIO(VLV_DISPLAY_BASE + 0x6d92c + (sprite) * 0x1000)
|
|
|
|
#define SPCSCCBOCLAMP(sprite) _MMIO(VLV_DISPLAY_BASE + 0x6d930 + (sprite) * 0x1000)
|
|
|
|
#define SPCSCCROCLAMP(sprite) _MMIO(VLV_DISPLAY_BASE + 0x6d934 + (sprite) * 0x1000)
|
2014-10-20 16:47:53 +00:00
|
|
|
#define SPCSC_OMAX(x) ((x) << 16) /* u10 */
|
|
|
|
#define SPCSC_OMIN(x) ((x) << 0) /* u10 */
|
|
|
|
|
2013-07-03 20:06:04 +00:00
|
|
|
/* Skylake plane registers */
|
|
|
|
|
|
|
|
#define _PLANE_CTL_1_A 0x70180
|
|
|
|
#define _PLANE_CTL_2_A 0x70280
|
|
|
|
#define _PLANE_CTL_3_A 0x70380
|
|
|
|
#define PLANE_CTL_ENABLE (1 << 31)
|
|
|
|
#define PLANE_CTL_PIPE_GAMMA_ENABLE (1 << 30)
|
|
|
|
#define PLANE_CTL_FORMAT_MASK (0xf << 24)
|
|
|
|
#define PLANE_CTL_FORMAT_YUV422 ( 0 << 24)
|
|
|
|
#define PLANE_CTL_FORMAT_NV12 ( 1 << 24)
|
|
|
|
#define PLANE_CTL_FORMAT_XRGB_2101010 ( 2 << 24)
|
|
|
|
#define PLANE_CTL_FORMAT_XRGB_8888 ( 4 << 24)
|
|
|
|
#define PLANE_CTL_FORMAT_XRGB_16161616F ( 6 << 24)
|
|
|
|
#define PLANE_CTL_FORMAT_AYUV ( 8 << 24)
|
|
|
|
#define PLANE_CTL_FORMAT_INDEXED ( 12 << 24)
|
|
|
|
#define PLANE_CTL_FORMAT_RGB_565 ( 14 << 24)
|
|
|
|
#define PLANE_CTL_PIPE_CSC_ENABLE (1 << 23)
|
2013-12-04 00:49:41 +00:00
|
|
|
#define PLANE_CTL_KEY_ENABLE_MASK (0x3 << 21)
|
|
|
|
#define PLANE_CTL_KEY_ENABLE_SOURCE ( 1 << 21)
|
|
|
|
#define PLANE_CTL_KEY_ENABLE_DESTINATION ( 2 << 21)
|
2013-07-03 20:06:04 +00:00
|
|
|
#define PLANE_CTL_ORDER_BGRX (0 << 20)
|
|
|
|
#define PLANE_CTL_ORDER_RGBX (1 << 20)
|
|
|
|
#define PLANE_CTL_YUV422_ORDER_MASK (0x3 << 16)
|
|
|
|
#define PLANE_CTL_YUV422_YUYV ( 0 << 16)
|
|
|
|
#define PLANE_CTL_YUV422_UYVY ( 1 << 16)
|
|
|
|
#define PLANE_CTL_YUV422_YVYU ( 2 << 16)
|
|
|
|
#define PLANE_CTL_YUV422_VYUY ( 3 << 16)
|
|
|
|
#define PLANE_CTL_DECOMPRESSION_ENABLE (1 << 15)
|
|
|
|
#define PLANE_CTL_TRICKLE_FEED_DISABLE (1 << 14)
|
|
|
|
#define PLANE_CTL_PLANE_GAMMA_DISABLE (1 << 13)
|
|
|
|
#define PLANE_CTL_TILED_MASK (0x7 << 10)
|
|
|
|
#define PLANE_CTL_TILED_LINEAR ( 0 << 10)
|
|
|
|
#define PLANE_CTL_TILED_X ( 1 << 10)
|
|
|
|
#define PLANE_CTL_TILED_Y ( 4 << 10)
|
|
|
|
#define PLANE_CTL_TILED_YF ( 5 << 10)
|
|
|
|
#define PLANE_CTL_ALPHA_MASK (0x3 << 4)
|
|
|
|
#define PLANE_CTL_ALPHA_DISABLE ( 0 << 4)
|
|
|
|
#define PLANE_CTL_ALPHA_SW_PREMULTIPLY ( 2 << 4)
|
|
|
|
#define PLANE_CTL_ALPHA_HW_PREMULTIPLY ( 3 << 4)
|
2014-10-04 09:53:31 +00:00
|
|
|
#define PLANE_CTL_ROTATE_MASK 0x3
|
|
|
|
#define PLANE_CTL_ROTATE_0 0x0
|
2015-04-10 09:07:29 +00:00
|
|
|
#define PLANE_CTL_ROTATE_90 0x1
|
2014-10-04 09:53:31 +00:00
|
|
|
#define PLANE_CTL_ROTATE_180 0x2
|
2015-04-10 09:07:29 +00:00
|
|
|
#define PLANE_CTL_ROTATE_270 0x3
|
2013-07-03 20:06:04 +00:00
|
|
|
#define _PLANE_STRIDE_1_A 0x70188
|
|
|
|
#define _PLANE_STRIDE_2_A 0x70288
|
|
|
|
#define _PLANE_STRIDE_3_A 0x70388
|
|
|
|
#define _PLANE_POS_1_A 0x7018c
|
|
|
|
#define _PLANE_POS_2_A 0x7028c
|
|
|
|
#define _PLANE_POS_3_A 0x7038c
|
|
|
|
#define _PLANE_SIZE_1_A 0x70190
|
|
|
|
#define _PLANE_SIZE_2_A 0x70290
|
|
|
|
#define _PLANE_SIZE_3_A 0x70390
|
|
|
|
#define _PLANE_SURF_1_A 0x7019c
|
|
|
|
#define _PLANE_SURF_2_A 0x7029c
|
|
|
|
#define _PLANE_SURF_3_A 0x7039c
|
|
|
|
#define _PLANE_OFFSET_1_A 0x701a4
|
|
|
|
#define _PLANE_OFFSET_2_A 0x702a4
|
|
|
|
#define _PLANE_OFFSET_3_A 0x703a4
|
2013-12-04 00:49:41 +00:00
|
|
|
#define _PLANE_KEYVAL_1_A 0x70194
|
|
|
|
#define _PLANE_KEYVAL_2_A 0x70294
|
|
|
|
#define _PLANE_KEYMSK_1_A 0x70198
|
|
|
|
#define _PLANE_KEYMSK_2_A 0x70298
|
|
|
|
#define _PLANE_KEYMAX_1_A 0x701a0
|
|
|
|
#define _PLANE_KEYMAX_2_A 0x702a0
|
2014-11-04 17:06:44 +00:00
|
|
|
#define _PLANE_BUF_CFG_1_A 0x7027c
|
|
|
|
#define _PLANE_BUF_CFG_2_A 0x7037c
|
2015-04-27 22:47:37 +00:00
|
|
|
#define _PLANE_NV12_BUF_CFG_1_A 0x70278
|
|
|
|
#define _PLANE_NV12_BUF_CFG_2_A 0x70378
|
2013-07-03 20:06:04 +00:00
|
|
|
|
|
|
|
#define _PLANE_CTL_1_B 0x71180
|
|
|
|
#define _PLANE_CTL_2_B 0x71280
|
|
|
|
#define _PLANE_CTL_3_B 0x71380
|
|
|
|
#define _PLANE_CTL_1(pipe) _PIPE(pipe, _PLANE_CTL_1_A, _PLANE_CTL_1_B)
|
|
|
|
#define _PLANE_CTL_2(pipe) _PIPE(pipe, _PLANE_CTL_2_A, _PLANE_CTL_2_B)
|
|
|
|
#define _PLANE_CTL_3(pipe) _PIPE(pipe, _PLANE_CTL_3_A, _PLANE_CTL_3_B)
|
|
|
|
#define PLANE_CTL(pipe, plane) \
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
_MMIO_PLANE(plane, _PLANE_CTL_1(pipe), _PLANE_CTL_2(pipe))
|
2013-07-03 20:06:04 +00:00
|
|
|
|
|
|
|
#define _PLANE_STRIDE_1_B 0x71188
|
|
|
|
#define _PLANE_STRIDE_2_B 0x71288
|
|
|
|
#define _PLANE_STRIDE_3_B 0x71388
|
|
|
|
#define _PLANE_STRIDE_1(pipe) \
|
|
|
|
_PIPE(pipe, _PLANE_STRIDE_1_A, _PLANE_STRIDE_1_B)
|
|
|
|
#define _PLANE_STRIDE_2(pipe) \
|
|
|
|
_PIPE(pipe, _PLANE_STRIDE_2_A, _PLANE_STRIDE_2_B)
|
|
|
|
#define _PLANE_STRIDE_3(pipe) \
|
|
|
|
_PIPE(pipe, _PLANE_STRIDE_3_A, _PLANE_STRIDE_3_B)
|
|
|
|
#define PLANE_STRIDE(pipe, plane) \
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
_MMIO_PLANE(plane, _PLANE_STRIDE_1(pipe), _PLANE_STRIDE_2(pipe))
|
2013-07-03 20:06:04 +00:00
|
|
|
|
|
|
|
#define _PLANE_POS_1_B 0x7118c
|
|
|
|
#define _PLANE_POS_2_B 0x7128c
|
|
|
|
#define _PLANE_POS_3_B 0x7138c
|
|
|
|
#define _PLANE_POS_1(pipe) _PIPE(pipe, _PLANE_POS_1_A, _PLANE_POS_1_B)
|
|
|
|
#define _PLANE_POS_2(pipe) _PIPE(pipe, _PLANE_POS_2_A, _PLANE_POS_2_B)
|
|
|
|
#define _PLANE_POS_3(pipe) _PIPE(pipe, _PLANE_POS_3_A, _PLANE_POS_3_B)
|
|
|
|
#define PLANE_POS(pipe, plane) \
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
_MMIO_PLANE(plane, _PLANE_POS_1(pipe), _PLANE_POS_2(pipe))
|
2013-07-03 20:06:04 +00:00
|
|
|
|
|
|
|
#define _PLANE_SIZE_1_B 0x71190
|
|
|
|
#define _PLANE_SIZE_2_B 0x71290
|
|
|
|
#define _PLANE_SIZE_3_B 0x71390
|
|
|
|
#define _PLANE_SIZE_1(pipe) _PIPE(pipe, _PLANE_SIZE_1_A, _PLANE_SIZE_1_B)
|
|
|
|
#define _PLANE_SIZE_2(pipe) _PIPE(pipe, _PLANE_SIZE_2_A, _PLANE_SIZE_2_B)
|
|
|
|
#define _PLANE_SIZE_3(pipe) _PIPE(pipe, _PLANE_SIZE_3_A, _PLANE_SIZE_3_B)
|
|
|
|
#define PLANE_SIZE(pipe, plane) \
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
_MMIO_PLANE(plane, _PLANE_SIZE_1(pipe), _PLANE_SIZE_2(pipe))
|
2013-07-03 20:06:04 +00:00
|
|
|
|
|
|
|
#define _PLANE_SURF_1_B 0x7119c
|
|
|
|
#define _PLANE_SURF_2_B 0x7129c
|
|
|
|
#define _PLANE_SURF_3_B 0x7139c
|
|
|
|
#define _PLANE_SURF_1(pipe) _PIPE(pipe, _PLANE_SURF_1_A, _PLANE_SURF_1_B)
|
|
|
|
#define _PLANE_SURF_2(pipe) _PIPE(pipe, _PLANE_SURF_2_A, _PLANE_SURF_2_B)
|
|
|
|
#define _PLANE_SURF_3(pipe) _PIPE(pipe, _PLANE_SURF_3_A, _PLANE_SURF_3_B)
|
|
|
|
#define PLANE_SURF(pipe, plane) \
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
_MMIO_PLANE(plane, _PLANE_SURF_1(pipe), _PLANE_SURF_2(pipe))
|
2013-07-03 20:06:04 +00:00
|
|
|
|
|
|
|
#define _PLANE_OFFSET_1_B 0x711a4
|
|
|
|
#define _PLANE_OFFSET_2_B 0x712a4
|
|
|
|
#define _PLANE_OFFSET_1(pipe) _PIPE(pipe, _PLANE_OFFSET_1_A, _PLANE_OFFSET_1_B)
|
|
|
|
#define _PLANE_OFFSET_2(pipe) _PIPE(pipe, _PLANE_OFFSET_2_A, _PLANE_OFFSET_2_B)
|
|
|
|
#define PLANE_OFFSET(pipe, plane) \
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
_MMIO_PLANE(plane, _PLANE_OFFSET_1(pipe), _PLANE_OFFSET_2(pipe))
|
2013-07-03 20:06:04 +00:00
|
|
|
|
2013-12-04 00:49:41 +00:00
|
|
|
#define _PLANE_KEYVAL_1_B 0x71194
|
|
|
|
#define _PLANE_KEYVAL_2_B 0x71294
|
|
|
|
#define _PLANE_KEYVAL_1(pipe) _PIPE(pipe, _PLANE_KEYVAL_1_A, _PLANE_KEYVAL_1_B)
|
|
|
|
#define _PLANE_KEYVAL_2(pipe) _PIPE(pipe, _PLANE_KEYVAL_2_A, _PLANE_KEYVAL_2_B)
|
|
|
|
#define PLANE_KEYVAL(pipe, plane) \
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
_MMIO_PLANE(plane, _PLANE_KEYVAL_1(pipe), _PLANE_KEYVAL_2(pipe))
|
2013-12-04 00:49:41 +00:00
|
|
|
|
|
|
|
#define _PLANE_KEYMSK_1_B 0x71198
|
|
|
|
#define _PLANE_KEYMSK_2_B 0x71298
|
|
|
|
#define _PLANE_KEYMSK_1(pipe) _PIPE(pipe, _PLANE_KEYMSK_1_A, _PLANE_KEYMSK_1_B)
|
|
|
|
#define _PLANE_KEYMSK_2(pipe) _PIPE(pipe, _PLANE_KEYMSK_2_A, _PLANE_KEYMSK_2_B)
|
|
|
|
#define PLANE_KEYMSK(pipe, plane) \
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
_MMIO_PLANE(plane, _PLANE_KEYMSK_1(pipe), _PLANE_KEYMSK_2(pipe))
|
2013-12-04 00:49:41 +00:00
|
|
|
|
|
|
|
#define _PLANE_KEYMAX_1_B 0x711a0
|
|
|
|
#define _PLANE_KEYMAX_2_B 0x712a0
|
|
|
|
#define _PLANE_KEYMAX_1(pipe) _PIPE(pipe, _PLANE_KEYMAX_1_A, _PLANE_KEYMAX_1_B)
|
|
|
|
#define _PLANE_KEYMAX_2(pipe) _PIPE(pipe, _PLANE_KEYMAX_2_A, _PLANE_KEYMAX_2_B)
|
|
|
|
#define PLANE_KEYMAX(pipe, plane) \
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
_MMIO_PLANE(plane, _PLANE_KEYMAX_1(pipe), _PLANE_KEYMAX_2(pipe))
|
2013-12-04 00:49:41 +00:00
|
|
|
|
2014-11-04 17:06:44 +00:00
|
|
|
#define _PLANE_BUF_CFG_1_B 0x7127c
|
|
|
|
#define _PLANE_BUF_CFG_2_B 0x7137c
|
|
|
|
#define _PLANE_BUF_CFG_1(pipe) \
|
|
|
|
_PIPE(pipe, _PLANE_BUF_CFG_1_A, _PLANE_BUF_CFG_1_B)
|
|
|
|
#define _PLANE_BUF_CFG_2(pipe) \
|
|
|
|
_PIPE(pipe, _PLANE_BUF_CFG_2_A, _PLANE_BUF_CFG_2_B)
|
|
|
|
#define PLANE_BUF_CFG(pipe, plane) \
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
_MMIO_PLANE(plane, _PLANE_BUF_CFG_1(pipe), _PLANE_BUF_CFG_2(pipe))
|
2014-11-04 17:06:44 +00:00
|
|
|
|
2015-04-27 22:47:37 +00:00
|
|
|
#define _PLANE_NV12_BUF_CFG_1_B 0x71278
|
|
|
|
#define _PLANE_NV12_BUF_CFG_2_B 0x71378
|
|
|
|
#define _PLANE_NV12_BUF_CFG_1(pipe) \
|
|
|
|
_PIPE(pipe, _PLANE_NV12_BUF_CFG_1_A, _PLANE_NV12_BUF_CFG_1_B)
|
|
|
|
#define _PLANE_NV12_BUF_CFG_2(pipe) \
|
|
|
|
_PIPE(pipe, _PLANE_NV12_BUF_CFG_2_A, _PLANE_NV12_BUF_CFG_2_B)
|
|
|
|
#define PLANE_NV12_BUF_CFG(pipe, plane) \
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
_MMIO_PLANE(plane, _PLANE_NV12_BUF_CFG_1(pipe), _PLANE_NV12_BUF_CFG_2(pipe))
|
2015-04-27 22:47:37 +00:00
|
|
|
|
2014-11-04 17:06:44 +00:00
|
|
|
/* SKL new cursor registers */
|
|
|
|
#define _CUR_BUF_CFG_A 0x7017c
|
|
|
|
#define _CUR_BUF_CFG_B 0x7117c
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define CUR_BUF_CFG(pipe) _MMIO_PIPE(pipe, _CUR_BUF_CFG_A, _CUR_BUF_CFG_B)
|
2014-11-04 17:06:44 +00:00
|
|
|
|
2008-07-29 18:54:06 +00:00
|
|
|
/* VBIOS regs */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define VGACNTRL _MMIO(0x71400)
|
2008-07-29 18:54:06 +00:00
|
|
|
# define VGA_DISP_DISABLE (1 << 31)
|
|
|
|
# define VGA_2X_MODE (1 << 30)
|
|
|
|
# define VGA_PIPE_B_SELECT (1 << 29)
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define VLV_VGACNTRL _MMIO(VLV_DISPLAY_BASE + 0x71400)
|
2013-01-25 19:44:46 +00:00
|
|
|
|
2009-12-03 22:14:42 +00:00
|
|
|
/* Ironlake */
|
2009-06-05 07:38:38 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define CPU_VGACNTRL _MMIO(0x41000)
|
2009-06-05 07:38:38 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define DIGITAL_PORT_HOTPLUG_CNTRL _MMIO(0x44030)
|
2015-08-27 20:55:56 +00:00
|
|
|
#define DIGITAL_PORTA_HOTPLUG_ENABLE (1 << 4)
|
|
|
|
#define DIGITAL_PORTA_PULSE_DURATION_2ms (0 << 2) /* pre-HSW */
|
|
|
|
#define DIGITAL_PORTA_PULSE_DURATION_4_5ms (1 << 2) /* pre-HSW */
|
|
|
|
#define DIGITAL_PORTA_PULSE_DURATION_6ms (2 << 2) /* pre-HSW */
|
|
|
|
#define DIGITAL_PORTA_PULSE_DURATION_100ms (3 << 2) /* pre-HSW */
|
|
|
|
#define DIGITAL_PORTA_PULSE_DURATION_MASK (3 << 2) /* pre-HSW */
|
|
|
|
#define DIGITAL_PORTA_HOTPLUG_STATUS_MASK (3 << 0)
|
|
|
|
#define DIGITAL_PORTA_HOTPLUG_NO_DETECT (0 << 0)
|
|
|
|
#define DIGITAL_PORTA_HOTPLUG_SHORT_DETECT (1 << 0)
|
|
|
|
#define DIGITAL_PORTA_HOTPLUG_LONG_DETECT (2 << 0)
|
2009-06-05 07:38:38 +00:00
|
|
|
|
|
|
|
/* refresh rate hardware control */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define RR_HW_CTL _MMIO(0x45300)
|
2009-06-05 07:38:38 +00:00
|
|
|
#define RR_HW_LOW_POWER_FRAMES_MASK 0xff
|
|
|
|
#define RR_HW_HIGH_POWER_FRAMES_MASK 0xff00
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define FDI_PLL_BIOS_0 _MMIO(0x46000)
|
2010-09-07 19:54:59 +00:00
|
|
|
#define FDI_PLL_FB_CLOCK_MASK 0xff
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define FDI_PLL_BIOS_1 _MMIO(0x46004)
|
|
|
|
#define FDI_PLL_BIOS_2 _MMIO(0x46008)
|
|
|
|
#define DISPLAY_PORT_PLL_BIOS_0 _MMIO(0x4600c)
|
|
|
|
#define DISPLAY_PORT_PLL_BIOS_1 _MMIO(0x46010)
|
|
|
|
#define DISPLAY_PORT_PLL_BIOS_2 _MMIO(0x46014)
|
2009-06-05 07:38:38 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define PCH_3DCGDIS0 _MMIO(0x46020)
|
2010-03-18 20:21:14 +00:00
|
|
|
# define MARIUNIT_CLOCK_GATE_DISABLE (1 << 18)
|
|
|
|
# define SVSMUNIT_CLOCK_GATE_DISABLE (1 << 1)
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define PCH_3DCGDIS1 _MMIO(0x46024)
|
2010-12-14 18:06:46 +00:00
|
|
|
# define VFMUNIT_CLOCK_GATE_DISABLE (1 << 11)
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define FDI_PLL_FREQ_CTL _MMIO(0x46030)
|
2009-06-05 07:38:38 +00:00
|
|
|
#define FDI_PLL_FREQ_CHANGE_REQUEST (1<<24)
|
|
|
|
#define FDI_PLL_FREQ_LOCK_LIMIT_MASK 0xfff00
|
|
|
|
#define FDI_PLL_FREQ_DISABLE_COUNT_LIMIT_MASK 0xff
|
|
|
|
|
|
|
|
|
drm/i915: Reorganize display pipe register accesses
RFCv2: Reorganize array indexing so that full offsets can be used as
is. It makes grepping for registers in i915_reg.h much easier. Also
move offset arrays to intel_device_info.
v1: Fixed offsets for VLV, proper eDP handling
v2: Fixed BCLRPAT, PIPESRC, PIPECONF and DSP* macros.
v3: Added EDP pipe comment, removed redundant offset arrays for
MSA_MISC and DDI_FUNC_CTL.
v4: Rename patch and report object size increase.
v5: Change location of commas, add PIPE_EDP into enum pipe
v6: Insert PIPE_EDP_OFFSET into pipe offset array
v7: Set I915_MAX_PIPES back to 3, change more registers accessors
to use the new macros, get rid of _PIPE_INC and add dev_priv
as a parameter where required by the new macros.
Upcoming hardware will not have the various display pipe register
ranges evenly spaced in memory. Change register address calculations
into array lookups.
Tested on SNB, VLV, IVB, Gen2 and HSW w/eDP.
I left the UMS cruft untouched.
Size differences:
text data bss dec hex filename
596431 4634 56 601121 92c21 i915.ko (new)
593199 4634 56 597889 91f81 i915.ko (old)
Signed-off-by: Antti Koskipaa <antti.koskipaa@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Tested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-02-04 12:22:24 +00:00
|
|
|
#define _PIPEA_DATA_M1 0x60030
|
2010-09-11 12:48:45 +00:00
|
|
|
#define PIPE_DATA_M1_OFFSET 0
|
drm/i915: Reorganize display pipe register accesses
RFCv2: Reorganize array indexing so that full offsets can be used as
is. It makes grepping for registers in i915_reg.h much easier. Also
move offset arrays to intel_device_info.
v1: Fixed offsets for VLV, proper eDP handling
v2: Fixed BCLRPAT, PIPESRC, PIPECONF and DSP* macros.
v3: Added EDP pipe comment, removed redundant offset arrays for
MSA_MISC and DDI_FUNC_CTL.
v4: Rename patch and report object size increase.
v5: Change location of commas, add PIPE_EDP into enum pipe
v6: Insert PIPE_EDP_OFFSET into pipe offset array
v7: Set I915_MAX_PIPES back to 3, change more registers accessors
to use the new macros, get rid of _PIPE_INC and add dev_priv
as a parameter where required by the new macros.
Upcoming hardware will not have the various display pipe register
ranges evenly spaced in memory. Change register address calculations
into array lookups.
Tested on SNB, VLV, IVB, Gen2 and HSW w/eDP.
I left the UMS cruft untouched.
Size differences:
text data bss dec hex filename
596431 4634 56 601121 92c21 i915.ko (new)
593199 4634 56 597889 91f81 i915.ko (old)
Signed-off-by: Antti Koskipaa <antti.koskipaa@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Tested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-02-04 12:22:24 +00:00
|
|
|
#define _PIPEA_DATA_N1 0x60034
|
2010-09-11 12:48:45 +00:00
|
|
|
#define PIPE_DATA_N1_OFFSET 0
|
2009-06-05 07:38:38 +00:00
|
|
|
|
drm/i915: Reorganize display pipe register accesses
RFCv2: Reorganize array indexing so that full offsets can be used as
is. It makes grepping for registers in i915_reg.h much easier. Also
move offset arrays to intel_device_info.
v1: Fixed offsets for VLV, proper eDP handling
v2: Fixed BCLRPAT, PIPESRC, PIPECONF and DSP* macros.
v3: Added EDP pipe comment, removed redundant offset arrays for
MSA_MISC and DDI_FUNC_CTL.
v4: Rename patch and report object size increase.
v5: Change location of commas, add PIPE_EDP into enum pipe
v6: Insert PIPE_EDP_OFFSET into pipe offset array
v7: Set I915_MAX_PIPES back to 3, change more registers accessors
to use the new macros, get rid of _PIPE_INC and add dev_priv
as a parameter where required by the new macros.
Upcoming hardware will not have the various display pipe register
ranges evenly spaced in memory. Change register address calculations
into array lookups.
Tested on SNB, VLV, IVB, Gen2 and HSW w/eDP.
I left the UMS cruft untouched.
Size differences:
text data bss dec hex filename
596431 4634 56 601121 92c21 i915.ko (new)
593199 4634 56 597889 91f81 i915.ko (old)
Signed-off-by: Antti Koskipaa <antti.koskipaa@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Tested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-02-04 12:22:24 +00:00
|
|
|
#define _PIPEA_DATA_M2 0x60038
|
2010-09-11 12:48:45 +00:00
|
|
|
#define PIPE_DATA_M2_OFFSET 0
|
drm/i915: Reorganize display pipe register accesses
RFCv2: Reorganize array indexing so that full offsets can be used as
is. It makes grepping for registers in i915_reg.h much easier. Also
move offset arrays to intel_device_info.
v1: Fixed offsets for VLV, proper eDP handling
v2: Fixed BCLRPAT, PIPESRC, PIPECONF and DSP* macros.
v3: Added EDP pipe comment, removed redundant offset arrays for
MSA_MISC and DDI_FUNC_CTL.
v4: Rename patch and report object size increase.
v5: Change location of commas, add PIPE_EDP into enum pipe
v6: Insert PIPE_EDP_OFFSET into pipe offset array
v7: Set I915_MAX_PIPES back to 3, change more registers accessors
to use the new macros, get rid of _PIPE_INC and add dev_priv
as a parameter where required by the new macros.
Upcoming hardware will not have the various display pipe register
ranges evenly spaced in memory. Change register address calculations
into array lookups.
Tested on SNB, VLV, IVB, Gen2 and HSW w/eDP.
I left the UMS cruft untouched.
Size differences:
text data bss dec hex filename
596431 4634 56 601121 92c21 i915.ko (new)
593199 4634 56 597889 91f81 i915.ko (old)
Signed-off-by: Antti Koskipaa <antti.koskipaa@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Tested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-02-04 12:22:24 +00:00
|
|
|
#define _PIPEA_DATA_N2 0x6003c
|
2010-09-11 12:48:45 +00:00
|
|
|
#define PIPE_DATA_N2_OFFSET 0
|
2009-06-05 07:38:38 +00:00
|
|
|
|
drm/i915: Reorganize display pipe register accesses
RFCv2: Reorganize array indexing so that full offsets can be used as
is. It makes grepping for registers in i915_reg.h much easier. Also
move offset arrays to intel_device_info.
v1: Fixed offsets for VLV, proper eDP handling
v2: Fixed BCLRPAT, PIPESRC, PIPECONF and DSP* macros.
v3: Added EDP pipe comment, removed redundant offset arrays for
MSA_MISC and DDI_FUNC_CTL.
v4: Rename patch and report object size increase.
v5: Change location of commas, add PIPE_EDP into enum pipe
v6: Insert PIPE_EDP_OFFSET into pipe offset array
v7: Set I915_MAX_PIPES back to 3, change more registers accessors
to use the new macros, get rid of _PIPE_INC and add dev_priv
as a parameter where required by the new macros.
Upcoming hardware will not have the various display pipe register
ranges evenly spaced in memory. Change register address calculations
into array lookups.
Tested on SNB, VLV, IVB, Gen2 and HSW w/eDP.
I left the UMS cruft untouched.
Size differences:
text data bss dec hex filename
596431 4634 56 601121 92c21 i915.ko (new)
593199 4634 56 597889 91f81 i915.ko (old)
Signed-off-by: Antti Koskipaa <antti.koskipaa@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Tested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-02-04 12:22:24 +00:00
|
|
|
#define _PIPEA_LINK_M1 0x60040
|
2010-09-11 12:48:45 +00:00
|
|
|
#define PIPE_LINK_M1_OFFSET 0
|
drm/i915: Reorganize display pipe register accesses
RFCv2: Reorganize array indexing so that full offsets can be used as
is. It makes grepping for registers in i915_reg.h much easier. Also
move offset arrays to intel_device_info.
v1: Fixed offsets for VLV, proper eDP handling
v2: Fixed BCLRPAT, PIPESRC, PIPECONF and DSP* macros.
v3: Added EDP pipe comment, removed redundant offset arrays for
MSA_MISC and DDI_FUNC_CTL.
v4: Rename patch and report object size increase.
v5: Change location of commas, add PIPE_EDP into enum pipe
v6: Insert PIPE_EDP_OFFSET into pipe offset array
v7: Set I915_MAX_PIPES back to 3, change more registers accessors
to use the new macros, get rid of _PIPE_INC and add dev_priv
as a parameter where required by the new macros.
Upcoming hardware will not have the various display pipe register
ranges evenly spaced in memory. Change register address calculations
into array lookups.
Tested on SNB, VLV, IVB, Gen2 and HSW w/eDP.
I left the UMS cruft untouched.
Size differences:
text data bss dec hex filename
596431 4634 56 601121 92c21 i915.ko (new)
593199 4634 56 597889 91f81 i915.ko (old)
Signed-off-by: Antti Koskipaa <antti.koskipaa@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Tested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-02-04 12:22:24 +00:00
|
|
|
#define _PIPEA_LINK_N1 0x60044
|
2010-09-11 12:48:45 +00:00
|
|
|
#define PIPE_LINK_N1_OFFSET 0
|
2009-06-05 07:38:38 +00:00
|
|
|
|
drm/i915: Reorganize display pipe register accesses
RFCv2: Reorganize array indexing so that full offsets can be used as
is. It makes grepping for registers in i915_reg.h much easier. Also
move offset arrays to intel_device_info.
v1: Fixed offsets for VLV, proper eDP handling
v2: Fixed BCLRPAT, PIPESRC, PIPECONF and DSP* macros.
v3: Added EDP pipe comment, removed redundant offset arrays for
MSA_MISC and DDI_FUNC_CTL.
v4: Rename patch and report object size increase.
v5: Change location of commas, add PIPE_EDP into enum pipe
v6: Insert PIPE_EDP_OFFSET into pipe offset array
v7: Set I915_MAX_PIPES back to 3, change more registers accessors
to use the new macros, get rid of _PIPE_INC and add dev_priv
as a parameter where required by the new macros.
Upcoming hardware will not have the various display pipe register
ranges evenly spaced in memory. Change register address calculations
into array lookups.
Tested on SNB, VLV, IVB, Gen2 and HSW w/eDP.
I left the UMS cruft untouched.
Size differences:
text data bss dec hex filename
596431 4634 56 601121 92c21 i915.ko (new)
593199 4634 56 597889 91f81 i915.ko (old)
Signed-off-by: Antti Koskipaa <antti.koskipaa@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Tested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-02-04 12:22:24 +00:00
|
|
|
#define _PIPEA_LINK_M2 0x60048
|
2010-09-11 12:48:45 +00:00
|
|
|
#define PIPE_LINK_M2_OFFSET 0
|
drm/i915: Reorganize display pipe register accesses
RFCv2: Reorganize array indexing so that full offsets can be used as
is. It makes grepping for registers in i915_reg.h much easier. Also
move offset arrays to intel_device_info.
v1: Fixed offsets for VLV, proper eDP handling
v2: Fixed BCLRPAT, PIPESRC, PIPECONF and DSP* macros.
v3: Added EDP pipe comment, removed redundant offset arrays for
MSA_MISC and DDI_FUNC_CTL.
v4: Rename patch and report object size increase.
v5: Change location of commas, add PIPE_EDP into enum pipe
v6: Insert PIPE_EDP_OFFSET into pipe offset array
v7: Set I915_MAX_PIPES back to 3, change more registers accessors
to use the new macros, get rid of _PIPE_INC and add dev_priv
as a parameter where required by the new macros.
Upcoming hardware will not have the various display pipe register
ranges evenly spaced in memory. Change register address calculations
into array lookups.
Tested on SNB, VLV, IVB, Gen2 and HSW w/eDP.
I left the UMS cruft untouched.
Size differences:
text data bss dec hex filename
596431 4634 56 601121 92c21 i915.ko (new)
593199 4634 56 597889 91f81 i915.ko (old)
Signed-off-by: Antti Koskipaa <antti.koskipaa@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Tested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-02-04 12:22:24 +00:00
|
|
|
#define _PIPEA_LINK_N2 0x6004c
|
2010-09-11 12:48:45 +00:00
|
|
|
#define PIPE_LINK_N2_OFFSET 0
|
2009-06-05 07:38:38 +00:00
|
|
|
|
|
|
|
/* PIPEB timing regs are same start from 0x61000 */
|
|
|
|
|
drm/i915: Reorganize display pipe register accesses
RFCv2: Reorganize array indexing so that full offsets can be used as
is. It makes grepping for registers in i915_reg.h much easier. Also
move offset arrays to intel_device_info.
v1: Fixed offsets for VLV, proper eDP handling
v2: Fixed BCLRPAT, PIPESRC, PIPECONF and DSP* macros.
v3: Added EDP pipe comment, removed redundant offset arrays for
MSA_MISC and DDI_FUNC_CTL.
v4: Rename patch and report object size increase.
v5: Change location of commas, add PIPE_EDP into enum pipe
v6: Insert PIPE_EDP_OFFSET into pipe offset array
v7: Set I915_MAX_PIPES back to 3, change more registers accessors
to use the new macros, get rid of _PIPE_INC and add dev_priv
as a parameter where required by the new macros.
Upcoming hardware will not have the various display pipe register
ranges evenly spaced in memory. Change register address calculations
into array lookups.
Tested on SNB, VLV, IVB, Gen2 and HSW w/eDP.
I left the UMS cruft untouched.
Size differences:
text data bss dec hex filename
596431 4634 56 601121 92c21 i915.ko (new)
593199 4634 56 597889 91f81 i915.ko (old)
Signed-off-by: Antti Koskipaa <antti.koskipaa@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Tested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-02-04 12:22:24 +00:00
|
|
|
#define _PIPEB_DATA_M1 0x61030
|
|
|
|
#define _PIPEB_DATA_N1 0x61034
|
|
|
|
#define _PIPEB_DATA_M2 0x61038
|
|
|
|
#define _PIPEB_DATA_N2 0x6103c
|
|
|
|
#define _PIPEB_LINK_M1 0x61040
|
|
|
|
#define _PIPEB_LINK_N1 0x61044
|
|
|
|
#define _PIPEB_LINK_M2 0x61048
|
|
|
|
#define _PIPEB_LINK_N2 0x6104c
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define PIPE_DATA_M1(tran) _MMIO_TRANS2(tran, _PIPEA_DATA_M1)
|
|
|
|
#define PIPE_DATA_N1(tran) _MMIO_TRANS2(tran, _PIPEA_DATA_N1)
|
|
|
|
#define PIPE_DATA_M2(tran) _MMIO_TRANS2(tran, _PIPEA_DATA_M2)
|
|
|
|
#define PIPE_DATA_N2(tran) _MMIO_TRANS2(tran, _PIPEA_DATA_N2)
|
|
|
|
#define PIPE_LINK_M1(tran) _MMIO_TRANS2(tran, _PIPEA_LINK_M1)
|
|
|
|
#define PIPE_LINK_N1(tran) _MMIO_TRANS2(tran, _PIPEA_LINK_N1)
|
|
|
|
#define PIPE_LINK_M2(tran) _MMIO_TRANS2(tran, _PIPEA_LINK_M2)
|
|
|
|
#define PIPE_LINK_N2(tran) _MMIO_TRANS2(tran, _PIPEA_LINK_N2)
|
2009-06-05 07:38:38 +00:00
|
|
|
|
|
|
|
/* CPU panel fitter */
|
2011-02-07 20:26:52 +00:00
|
|
|
/* IVB+ has 3 fitters, 0 is 7x5 capable, the other two only 3x3 */
|
|
|
|
#define _PFA_CTL_1 0x68080
|
|
|
|
#define _PFB_CTL_1 0x68880
|
2009-06-05 07:38:38 +00:00
|
|
|
#define PF_ENABLE (1<<31)
|
2012-11-20 15:27:41 +00:00
|
|
|
#define PF_PIPE_SEL_MASK_IVB (3<<29)
|
|
|
|
#define PF_PIPE_SEL_IVB(pipe) ((pipe)<<29)
|
2009-10-19 07:43:49 +00:00
|
|
|
#define PF_FILTER_MASK (3<<23)
|
|
|
|
#define PF_FILTER_PROGRAMMED (0<<23)
|
|
|
|
#define PF_FILTER_MED_3x3 (1<<23)
|
|
|
|
#define PF_FILTER_EDGE_ENHANCE (2<<23)
|
|
|
|
#define PF_FILTER_EDGE_SOFTEN (3<<23)
|
2011-02-07 20:26:52 +00:00
|
|
|
#define _PFA_WIN_SZ 0x68074
|
|
|
|
#define _PFB_WIN_SZ 0x68874
|
|
|
|
#define _PFA_WIN_POS 0x68070
|
|
|
|
#define _PFB_WIN_POS 0x68870
|
|
|
|
#define _PFA_VSCALE 0x68084
|
|
|
|
#define _PFB_VSCALE 0x68884
|
|
|
|
#define _PFA_HSCALE 0x68090
|
|
|
|
#define _PFB_HSCALE 0x68890
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define PF_CTL(pipe) _MMIO_PIPE(pipe, _PFA_CTL_1, _PFB_CTL_1)
|
|
|
|
#define PF_WIN_SZ(pipe) _MMIO_PIPE(pipe, _PFA_WIN_SZ, _PFB_WIN_SZ)
|
|
|
|
#define PF_WIN_POS(pipe) _MMIO_PIPE(pipe, _PFA_WIN_POS, _PFB_WIN_POS)
|
|
|
|
#define PF_VSCALE(pipe) _MMIO_PIPE(pipe, _PFA_VSCALE, _PFB_VSCALE)
|
|
|
|
#define PF_HSCALE(pipe) _MMIO_PIPE(pipe, _PFA_HSCALE, _PFB_HSCALE)
|
2009-06-05 07:38:38 +00:00
|
|
|
|
2014-11-13 17:51:47 +00:00
|
|
|
#define _PSA_CTL 0x68180
|
|
|
|
#define _PSB_CTL 0x68980
|
|
|
|
#define PS_ENABLE (1<<31)
|
|
|
|
#define _PSA_WIN_SZ 0x68174
|
|
|
|
#define _PSB_WIN_SZ 0x68974
|
|
|
|
#define _PSA_WIN_POS 0x68170
|
|
|
|
#define _PSB_WIN_POS 0x68970
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define PS_CTL(pipe) _MMIO_PIPE(pipe, _PSA_CTL, _PSB_CTL)
|
|
|
|
#define PS_WIN_SZ(pipe) _MMIO_PIPE(pipe, _PSA_WIN_SZ, _PSB_WIN_SZ)
|
|
|
|
#define PS_WIN_POS(pipe) _MMIO_PIPE(pipe, _PSA_WIN_POS, _PSB_WIN_POS)
|
2014-11-13 17:51:47 +00:00
|
|
|
|
2015-04-07 22:28:35 +00:00
|
|
|
/*
|
|
|
|
* Skylake scalers
|
|
|
|
*/
|
|
|
|
#define _PS_1A_CTRL 0x68180
|
|
|
|
#define _PS_2A_CTRL 0x68280
|
|
|
|
#define _PS_1B_CTRL 0x68980
|
|
|
|
#define _PS_2B_CTRL 0x68A80
|
|
|
|
#define _PS_1C_CTRL 0x69180
|
|
|
|
#define PS_SCALER_EN (1 << 31)
|
|
|
|
#define PS_SCALER_MODE_MASK (3 << 28)
|
|
|
|
#define PS_SCALER_MODE_DYN (0 << 28)
|
|
|
|
#define PS_SCALER_MODE_HQ (1 << 28)
|
|
|
|
#define PS_PLANE_SEL_MASK (7 << 25)
|
2015-09-18 17:03:39 +00:00
|
|
|
#define PS_PLANE_SEL(plane) (((plane) + 1) << 25)
|
2015-04-07 22:28:35 +00:00
|
|
|
#define PS_FILTER_MASK (3 << 23)
|
|
|
|
#define PS_FILTER_MEDIUM (0 << 23)
|
|
|
|
#define PS_FILTER_EDGE_ENHANCE (2 << 23)
|
|
|
|
#define PS_FILTER_BILINEAR (3 << 23)
|
|
|
|
#define PS_VERT3TAP (1 << 21)
|
|
|
|
#define PS_VERT_INT_INVERT_FIELD1 (0 << 20)
|
|
|
|
#define PS_VERT_INT_INVERT_FIELD0 (1 << 20)
|
|
|
|
#define PS_PWRUP_PROGRESS (1 << 17)
|
|
|
|
#define PS_V_FILTER_BYPASS (1 << 8)
|
|
|
|
#define PS_VADAPT_EN (1 << 7)
|
|
|
|
#define PS_VADAPT_MODE_MASK (3 << 5)
|
|
|
|
#define PS_VADAPT_MODE_LEAST_ADAPT (0 << 5)
|
|
|
|
#define PS_VADAPT_MODE_MOD_ADAPT (1 << 5)
|
|
|
|
#define PS_VADAPT_MODE_MOST_ADAPT (3 << 5)
|
|
|
|
|
|
|
|
#define _PS_PWR_GATE_1A 0x68160
|
|
|
|
#define _PS_PWR_GATE_2A 0x68260
|
|
|
|
#define _PS_PWR_GATE_1B 0x68960
|
|
|
|
#define _PS_PWR_GATE_2B 0x68A60
|
|
|
|
#define _PS_PWR_GATE_1C 0x69160
|
|
|
|
#define PS_PWR_GATE_DIS_OVERRIDE (1 << 31)
|
|
|
|
#define PS_PWR_GATE_SETTLING_TIME_32 (0 << 3)
|
|
|
|
#define PS_PWR_GATE_SETTLING_TIME_64 (1 << 3)
|
|
|
|
#define PS_PWR_GATE_SETTLING_TIME_96 (2 << 3)
|
|
|
|
#define PS_PWR_GATE_SETTLING_TIME_128 (3 << 3)
|
|
|
|
#define PS_PWR_GATE_SLPEN_8 0
|
|
|
|
#define PS_PWR_GATE_SLPEN_16 1
|
|
|
|
#define PS_PWR_GATE_SLPEN_24 2
|
|
|
|
#define PS_PWR_GATE_SLPEN_32 3
|
|
|
|
|
|
|
|
#define _PS_WIN_POS_1A 0x68170
|
|
|
|
#define _PS_WIN_POS_2A 0x68270
|
|
|
|
#define _PS_WIN_POS_1B 0x68970
|
|
|
|
#define _PS_WIN_POS_2B 0x68A70
|
|
|
|
#define _PS_WIN_POS_1C 0x69170
|
|
|
|
|
|
|
|
#define _PS_WIN_SZ_1A 0x68174
|
|
|
|
#define _PS_WIN_SZ_2A 0x68274
|
|
|
|
#define _PS_WIN_SZ_1B 0x68974
|
|
|
|
#define _PS_WIN_SZ_2B 0x68A74
|
|
|
|
#define _PS_WIN_SZ_1C 0x69174
|
|
|
|
|
|
|
|
#define _PS_VSCALE_1A 0x68184
|
|
|
|
#define _PS_VSCALE_2A 0x68284
|
|
|
|
#define _PS_VSCALE_1B 0x68984
|
|
|
|
#define _PS_VSCALE_2B 0x68A84
|
|
|
|
#define _PS_VSCALE_1C 0x69184
|
|
|
|
|
|
|
|
#define _PS_HSCALE_1A 0x68190
|
|
|
|
#define _PS_HSCALE_2A 0x68290
|
|
|
|
#define _PS_HSCALE_1B 0x68990
|
|
|
|
#define _PS_HSCALE_2B 0x68A90
|
|
|
|
#define _PS_HSCALE_1C 0x69190
|
|
|
|
|
|
|
|
#define _PS_VPHASE_1A 0x68188
|
|
|
|
#define _PS_VPHASE_2A 0x68288
|
|
|
|
#define _PS_VPHASE_1B 0x68988
|
|
|
|
#define _PS_VPHASE_2B 0x68A88
|
|
|
|
#define _PS_VPHASE_1C 0x69188
|
|
|
|
|
|
|
|
#define _PS_HPHASE_1A 0x68194
|
|
|
|
#define _PS_HPHASE_2A 0x68294
|
|
|
|
#define _PS_HPHASE_1B 0x68994
|
|
|
|
#define _PS_HPHASE_2B 0x68A94
|
|
|
|
#define _PS_HPHASE_1C 0x69194
|
|
|
|
|
|
|
|
#define _PS_ECC_STAT_1A 0x681D0
|
|
|
|
#define _PS_ECC_STAT_2A 0x682D0
|
|
|
|
#define _PS_ECC_STAT_1B 0x689D0
|
|
|
|
#define _PS_ECC_STAT_2B 0x68AD0
|
|
|
|
#define _PS_ECC_STAT_1C 0x691D0
|
|
|
|
|
|
|
|
#define _ID(id, a, b) ((a) + (id)*((b)-(a)))
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define SKL_PS_CTRL(pipe, id) _MMIO_PIPE(pipe, \
|
2015-04-07 22:28:35 +00:00
|
|
|
_ID(id, _PS_1A_CTRL, _PS_2A_CTRL), \
|
|
|
|
_ID(id, _PS_1B_CTRL, _PS_2B_CTRL))
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define SKL_PS_PWR_GATE(pipe, id) _MMIO_PIPE(pipe, \
|
2015-04-07 22:28:35 +00:00
|
|
|
_ID(id, _PS_PWR_GATE_1A, _PS_PWR_GATE_2A), \
|
|
|
|
_ID(id, _PS_PWR_GATE_1B, _PS_PWR_GATE_2B))
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define SKL_PS_WIN_POS(pipe, id) _MMIO_PIPE(pipe, \
|
2015-04-07 22:28:35 +00:00
|
|
|
_ID(id, _PS_WIN_POS_1A, _PS_WIN_POS_2A), \
|
|
|
|
_ID(id, _PS_WIN_POS_1B, _PS_WIN_POS_2B))
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define SKL_PS_WIN_SZ(pipe, id) _MMIO_PIPE(pipe, \
|
2015-04-07 22:28:35 +00:00
|
|
|
_ID(id, _PS_WIN_SZ_1A, _PS_WIN_SZ_2A), \
|
|
|
|
_ID(id, _PS_WIN_SZ_1B, _PS_WIN_SZ_2B))
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define SKL_PS_VSCALE(pipe, id) _MMIO_PIPE(pipe, \
|
2015-04-07 22:28:35 +00:00
|
|
|
_ID(id, _PS_VSCALE_1A, _PS_VSCALE_2A), \
|
|
|
|
_ID(id, _PS_VSCALE_1B, _PS_VSCALE_2B))
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define SKL_PS_HSCALE(pipe, id) _MMIO_PIPE(pipe, \
|
2015-04-07 22:28:35 +00:00
|
|
|
_ID(id, _PS_HSCALE_1A, _PS_HSCALE_2A), \
|
|
|
|
_ID(id, _PS_HSCALE_1B, _PS_HSCALE_2B))
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define SKL_PS_VPHASE(pipe, id) _MMIO_PIPE(pipe, \
|
2015-04-07 22:28:35 +00:00
|
|
|
_ID(id, _PS_VPHASE_1A, _PS_VPHASE_2A), \
|
|
|
|
_ID(id, _PS_VPHASE_1B, _PS_VPHASE_2B))
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define SKL_PS_HPHASE(pipe, id) _MMIO_PIPE(pipe, \
|
2015-04-07 22:28:35 +00:00
|
|
|
_ID(id, _PS_HPHASE_1A, _PS_HPHASE_2A), \
|
|
|
|
_ID(id, _PS_HPHASE_1B, _PS_HPHASE_2B))
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define SKL_PS_ECC_STAT(pipe, id) _MMIO_PIPE(pipe, \
|
2015-04-07 22:28:35 +00:00
|
|
|
_ID(id, _PS_ECC_STAT_1A, _PS_ECC_STAT_2A), \
|
2015-11-04 21:20:16 +00:00
|
|
|
_ID(id, _PS_ECC_STAT_1B, _PS_ECC_STAT_2B))
|
2015-04-07 22:28:35 +00:00
|
|
|
|
2009-06-05 07:38:38 +00:00
|
|
|
/* legacy palette */
|
2011-02-07 20:26:52 +00:00
|
|
|
#define _LGC_PALETTE_A 0x4a000
|
|
|
|
#define _LGC_PALETTE_B 0x4a800
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define LGC_PALETTE(pipe, i) _MMIO(_PIPE(pipe, _LGC_PALETTE_A, _LGC_PALETTE_B) + (i) * 4)
|
2009-06-05 07:38:38 +00:00
|
|
|
|
2013-05-31 19:33:22 +00:00
|
|
|
#define _GAMMA_MODE_A 0x4a480
|
|
|
|
#define _GAMMA_MODE_B 0x4ac80
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GAMMA_MODE(pipe) _MMIO_PIPE(pipe, _GAMMA_MODE_A, _GAMMA_MODE_B)
|
2013-05-31 19:33:22 +00:00
|
|
|
#define GAMMA_MODE_MODE_MASK (3 << 0)
|
2013-06-12 22:54:59 +00:00
|
|
|
#define GAMMA_MODE_MODE_8BIT (0 << 0)
|
|
|
|
#define GAMMA_MODE_MODE_10BIT (1 << 0)
|
|
|
|
#define GAMMA_MODE_MODE_12BIT (2 << 0)
|
2013-05-31 19:33:22 +00:00
|
|
|
#define GAMMA_MODE_MODE_SPLIT (3 << 0)
|
|
|
|
|
2015-10-30 15:53:32 +00:00
|
|
|
/* DMC/CSR */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define CSR_PROGRAM(i) _MMIO(0x80000 + (i) * 4)
|
2015-10-30 15:54:47 +00:00
|
|
|
#define CSR_SSP_BASE_ADDR_GEN9 0x00002FC0
|
|
|
|
#define CSR_HTP_ADDR_SKL 0x00500034
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define CSR_SSP_BASE _MMIO(0x8F074)
|
|
|
|
#define CSR_HTP_SKL _MMIO(0x8F004)
|
|
|
|
#define CSR_LAST_WRITE _MMIO(0x8F034)
|
2015-10-30 15:54:47 +00:00
|
|
|
#define CSR_LAST_WRITE_VALUE 0xc003b400
|
|
|
|
/* MMIO address range for CSR program (0x80000 - 0x82FFF) */
|
|
|
|
#define CSR_MMIO_START_RANGE 0x80000
|
|
|
|
#define CSR_MMIO_END_RANGE 0x8FFFF
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define SKL_CSR_DC3_DC5_COUNT _MMIO(0x80030)
|
|
|
|
#define SKL_CSR_DC5_DC6_COUNT _MMIO(0x8002C)
|
|
|
|
#define BXT_CSR_DC3_DC5_COUNT _MMIO(0x80038)
|
2015-10-30 15:53:32 +00:00
|
|
|
|
2009-06-05 07:38:38 +00:00
|
|
|
/* interrupts */
|
|
|
|
#define DE_MASTER_IRQ_CONTROL (1 << 31)
|
|
|
|
#define DE_SPRITEB_FLIP_DONE (1 << 29)
|
|
|
|
#define DE_SPRITEA_FLIP_DONE (1 << 28)
|
|
|
|
#define DE_PLANEB_FLIP_DONE (1 << 27)
|
|
|
|
#define DE_PLANEA_FLIP_DONE (1 << 26)
|
2013-10-21 16:04:36 +00:00
|
|
|
#define DE_PLANE_FLIP_DONE(plane) (1 << (26 + (plane)))
|
2009-06-05 07:38:38 +00:00
|
|
|
#define DE_PCU_EVENT (1 << 25)
|
|
|
|
#define DE_GTT_FAULT (1 << 24)
|
|
|
|
#define DE_POISON (1 << 23)
|
|
|
|
#define DE_PERFORM_COUNTER (1 << 22)
|
|
|
|
#define DE_PCH_EVENT (1 << 21)
|
|
|
|
#define DE_AUX_CHANNEL_A (1 << 20)
|
|
|
|
#define DE_DP_A_HOTPLUG (1 << 19)
|
|
|
|
#define DE_GSE (1 << 18)
|
|
|
|
#define DE_PIPEB_VBLANK (1 << 15)
|
|
|
|
#define DE_PIPEB_EVEN_FIELD (1 << 14)
|
|
|
|
#define DE_PIPEB_ODD_FIELD (1 << 13)
|
|
|
|
#define DE_PIPEB_LINE_COMPARE (1 << 12)
|
|
|
|
#define DE_PIPEB_VSYNC (1 << 11)
|
2013-10-16 20:55:48 +00:00
|
|
|
#define DE_PIPEB_CRC_DONE (1 << 10)
|
2009-06-05 07:38:38 +00:00
|
|
|
#define DE_PIPEB_FIFO_UNDERRUN (1 << 8)
|
|
|
|
#define DE_PIPEA_VBLANK (1 << 7)
|
2013-10-21 16:04:36 +00:00
|
|
|
#define DE_PIPE_VBLANK(pipe) (1 << (7 + 8*(pipe)))
|
2009-06-05 07:38:38 +00:00
|
|
|
#define DE_PIPEA_EVEN_FIELD (1 << 6)
|
|
|
|
#define DE_PIPEA_ODD_FIELD (1 << 5)
|
|
|
|
#define DE_PIPEA_LINE_COMPARE (1 << 4)
|
|
|
|
#define DE_PIPEA_VSYNC (1 << 3)
|
2013-10-16 20:55:48 +00:00
|
|
|
#define DE_PIPEA_CRC_DONE (1 << 2)
|
2013-10-21 16:04:36 +00:00
|
|
|
#define DE_PIPE_CRC_DONE(pipe) (1 << (2 + 8*(pipe)))
|
2009-06-05 07:38:38 +00:00
|
|
|
#define DE_PIPEA_FIFO_UNDERRUN (1 << 0)
|
2013-10-21 16:04:36 +00:00
|
|
|
#define DE_PIPE_FIFO_UNDERRUN(pipe) (1 << (8*(pipe)))
|
2009-06-05 07:38:38 +00:00
|
|
|
|
2011-04-06 19:13:38 +00:00
|
|
|
/* More Ivybridge lolz */
|
drm/i915: report Gen5+ CPU and PCH FIFO underruns
In this commit we enable both CPU and PCH FIFO underrun reporting and
start reporting them. We follow a few rules:
- after we receive one of these errors, we mask the interrupt, so
we won't get an "interrupt storm" and we also won't flood dmesg;
- at each mode set we enable the interrupts again, so we'll see each
message at most once per mode set;
- in the specific places where we need to ignore the errors, we
completely mask the interrupts.
The downside of this patch is that since we're completely disabling
(masking) the interrupts instead of just not printing error messages,
we will mask more than just what we want on IVB/HSW CPU interrupts
(due to GEN7_ERR_INT) and on CPT/PPT/LPT PCHs (due to SERR_INT). So
when we decide to mask PCH FIFO underruns for pipe A on CPT, we'll
also be masking PCH FIFO underruns for pipe B, because both are
reported by SERR_INT, which has to be either completely enabled or
completely disabled (in othe words, there's no way to disable/enable
specific bits of GEN7_ERR_INT and SERR_INT).
V2: Rename some functions and variables, downgrade messages to
DRM_DEBUG_DRIVER and rebase.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2013-04-12 20:57:57 +00:00
|
|
|
#define DE_ERR_INT_IVB (1<<30)
|
2011-04-06 19:13:38 +00:00
|
|
|
#define DE_GSE_IVB (1<<29)
|
|
|
|
#define DE_PCH_EVENT_IVB (1<<28)
|
|
|
|
#define DE_DP_A_HOTPLUG_IVB (1<<27)
|
|
|
|
#define DE_AUX_CHANNEL_A_IVB (1<<26)
|
2012-05-02 08:52:12 +00:00
|
|
|
#define DE_SPRITEC_FLIP_DONE_IVB (1<<14)
|
|
|
|
#define DE_PLANEC_FLIP_DONE_IVB (1<<13)
|
|
|
|
#define DE_PIPEC_VBLANK_IVB (1<<10)
|
2011-04-06 19:13:38 +00:00
|
|
|
#define DE_SPRITEB_FLIP_DONE_IVB (1<<9)
|
|
|
|
#define DE_PLANEB_FLIP_DONE_IVB (1<<8)
|
|
|
|
#define DE_PIPEB_VBLANK_IVB (1<<5)
|
2012-05-02 08:52:12 +00:00
|
|
|
#define DE_SPRITEA_FLIP_DONE_IVB (1<<4)
|
|
|
|
#define DE_PLANEA_FLIP_DONE_IVB (1<<3)
|
2013-10-21 16:04:36 +00:00
|
|
|
#define DE_PLANE_FLIP_DONE_IVB(plane) (1<< (3 + 5*(plane)))
|
2011-04-06 19:13:38 +00:00
|
|
|
#define DE_PIPEA_VBLANK_IVB (1<<0)
|
2015-09-18 17:03:39 +00:00
|
|
|
#define DE_PIPE_VBLANK_IVB(pipe) (1 << ((pipe) * 5))
|
2013-07-12 23:00:08 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define VLV_MASTER_IER _MMIO(0x4400c) /* Gunit master IER */
|
2012-03-22 21:38:44 +00:00
|
|
|
#define MASTER_INTERRUPT_ENABLE (1<<31)
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define DEISR _MMIO(0x44000)
|
|
|
|
#define DEIMR _MMIO(0x44004)
|
|
|
|
#define DEIIR _MMIO(0x44008)
|
|
|
|
#define DEIER _MMIO(0x4400c)
|
2009-06-05 07:38:38 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GTISR _MMIO(0x44010)
|
|
|
|
#define GTIMR _MMIO(0x44014)
|
|
|
|
#define GTIIR _MMIO(0x44018)
|
|
|
|
#define GTIER _MMIO(0x4401c)
|
2009-06-05 07:38:38 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN8_MASTER_IRQ _MMIO(0x44200)
|
drm/i915/bdw: Implement interrupt changes
The interrupt handling implementation remains the same as previous
generations with the 4 types of registers, status, identity, mask, and
enable. However the layout of where the bits go have changed entirely.
To address these changes, all of the interrupt vfuncs needed special
gen8 code.
The way it works is there is a top level status register now which
informs the interrupt service routine which unit caused the interrupt,
and therefore which interrupt registers to read to process the
interrupt. For display the division is quite logical, a set of interrupt
registers for each pipe, and in addition to those, a set each for "misc"
and port.
For GT the things get a bit hairy, as seen by the code. Each of the GT
units has it's own bits defined. They all look *very similar* and
resides in 16 bits of a GT register. As an example, RCS and BCS share
register 0. To compact the code a bit, at a slight expense to
complexity, this is exactly how the code works as well. 2 structures are
added to the ring buffer so that our ring buffer interrupt handling code
knows which ring shares the interrupt registers, and a shift value (ie.
the top or bottom 16 bits of the register).
The above allows us to kept the interrupt register caching scheme, the
per interrupt enables, and the code to mask and unmask interrupts
relatively clean (again at the cost of some more complexity).
Most of the GT units mentioned above are command streamers, and so the
symmetry should work quite well for even the yet to be implemented rings
which Broadwell adds.
v2: Fixes up a couple of bugs, and is more verbose about errors in the
Broadwell interrupt handler.
v3: fix DE_MISC IER offset
v4: Simplify interrupts:
I totally misread the docs the first time I implemented interrupts, and
so this should greatly simplify the mess. Unlike GEN6, we never touch
the regular mask registers in irq_get/put.
v5: Rebased on to of recent pch hotplug setup changes.
v6: Fixup on top of moving num_pipes to intel_info.
v7: Rebased on top of Egbert Eich's hpd irq handling rework. Also
wired up ibx_hpd_irq_setup for gen8.
v8: Rebase on top of Jani's asle handling rework.
v9: Rebase on top of Ben's VECS enabling for Haswell, where he
unfortunately went OCD on the gt irq #defines. Not that they're still
not yet fully consistent:
- Used the GT_RENDER_ #defines + bdw shifts.
- Dropped the shift from the L3_PARITY stuff, seemed clearer.
- s/irq_refcount/irq_refcount.gt/
v10: Squash in VECS enabling patches and the gen8_gt_irq_handler
refactoring from Zhao Yakui <yakui.zhao@intel.com>
v11: Rebase on top of the interrupt cleanups in upstream.
v12: Rebase on top of Ben's DPF changes in upstream.
v13: Drop bdw from the HAS_L3_DPF feature flag for now, it's unclear what
exactly needs to be done. Requested by Ben.
v14: Fix the patch.
- Drop the mask of reserved bits and assorted logic, it doesn't match
the spec.
- Do the posting read inconditionally instead of commenting it out.
- Add a GEN8_MASTER_IRQ_CONTROL definition and use it.
- Fix up the GEN8_PIPE interrupt defines and give the GEN8_ prefixes -
we actually will need to use them.
- Enclose macros in do {} while (0) (checkpatch).
- Clear DE_MISC interrupt bits only after having processed them.
- Fix whitespace fail (checkpatch).
- Fix overtly long lines where appropriate (checkpatch).
- Don't use typedef'ed private_t (maintainer-scripts).
- Align the function parameter list correctly.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v4)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
bikeshed
2013-11-03 04:07:09 +00:00
|
|
|
#define GEN8_MASTER_IRQ_CONTROL (1<<31)
|
|
|
|
#define GEN8_PCU_IRQ (1<<30)
|
|
|
|
#define GEN8_DE_PCH_IRQ (1<<23)
|
|
|
|
#define GEN8_DE_MISC_IRQ (1<<22)
|
|
|
|
#define GEN8_DE_PORT_IRQ (1<<20)
|
|
|
|
#define GEN8_DE_PIPE_C_IRQ (1<<18)
|
|
|
|
#define GEN8_DE_PIPE_B_IRQ (1<<17)
|
|
|
|
#define GEN8_DE_PIPE_A_IRQ (1<<16)
|
2015-09-18 17:03:39 +00:00
|
|
|
#define GEN8_DE_PIPE_IRQ(pipe) (1<<(16+(pipe)))
|
drm/i915/bdw: Implement interrupt changes
The interrupt handling implementation remains the same as previous
generations with the 4 types of registers, status, identity, mask, and
enable. However the layout of where the bits go have changed entirely.
To address these changes, all of the interrupt vfuncs needed special
gen8 code.
The way it works is there is a top level status register now which
informs the interrupt service routine which unit caused the interrupt,
and therefore which interrupt registers to read to process the
interrupt. For display the division is quite logical, a set of interrupt
registers for each pipe, and in addition to those, a set each for "misc"
and port.
For GT the things get a bit hairy, as seen by the code. Each of the GT
units has it's own bits defined. They all look *very similar* and
resides in 16 bits of a GT register. As an example, RCS and BCS share
register 0. To compact the code a bit, at a slight expense to
complexity, this is exactly how the code works as well. 2 structures are
added to the ring buffer so that our ring buffer interrupt handling code
knows which ring shares the interrupt registers, and a shift value (ie.
the top or bottom 16 bits of the register).
The above allows us to kept the interrupt register caching scheme, the
per interrupt enables, and the code to mask and unmask interrupts
relatively clean (again at the cost of some more complexity).
Most of the GT units mentioned above are command streamers, and so the
symmetry should work quite well for even the yet to be implemented rings
which Broadwell adds.
v2: Fixes up a couple of bugs, and is more verbose about errors in the
Broadwell interrupt handler.
v3: fix DE_MISC IER offset
v4: Simplify interrupts:
I totally misread the docs the first time I implemented interrupts, and
so this should greatly simplify the mess. Unlike GEN6, we never touch
the regular mask registers in irq_get/put.
v5: Rebased on to of recent pch hotplug setup changes.
v6: Fixup on top of moving num_pipes to intel_info.
v7: Rebased on top of Egbert Eich's hpd irq handling rework. Also
wired up ibx_hpd_irq_setup for gen8.
v8: Rebase on top of Jani's asle handling rework.
v9: Rebase on top of Ben's VECS enabling for Haswell, where he
unfortunately went OCD on the gt irq #defines. Not that they're still
not yet fully consistent:
- Used the GT_RENDER_ #defines + bdw shifts.
- Dropped the shift from the L3_PARITY stuff, seemed clearer.
- s/irq_refcount/irq_refcount.gt/
v10: Squash in VECS enabling patches and the gen8_gt_irq_handler
refactoring from Zhao Yakui <yakui.zhao@intel.com>
v11: Rebase on top of the interrupt cleanups in upstream.
v12: Rebase on top of Ben's DPF changes in upstream.
v13: Drop bdw from the HAS_L3_DPF feature flag for now, it's unclear what
exactly needs to be done. Requested by Ben.
v14: Fix the patch.
- Drop the mask of reserved bits and assorted logic, it doesn't match
the spec.
- Do the posting read inconditionally instead of commenting it out.
- Add a GEN8_MASTER_IRQ_CONTROL definition and use it.
- Fix up the GEN8_PIPE interrupt defines and give the GEN8_ prefixes -
we actually will need to use them.
- Enclose macros in do {} while (0) (checkpatch).
- Clear DE_MISC interrupt bits only after having processed them.
- Fix whitespace fail (checkpatch).
- Fix overtly long lines where appropriate (checkpatch).
- Don't use typedef'ed private_t (maintainer-scripts).
- Align the function parameter list correctly.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v4)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
bikeshed
2013-11-03 04:07:09 +00:00
|
|
|
#define GEN8_GT_VECS_IRQ (1<<6)
|
2014-05-15 17:58:08 +00:00
|
|
|
#define GEN8_GT_PM_IRQ (1<<4)
|
drm/i915/bdw: Implement interrupt changes
The interrupt handling implementation remains the same as previous
generations with the 4 types of registers, status, identity, mask, and
enable. However the layout of where the bits go have changed entirely.
To address these changes, all of the interrupt vfuncs needed special
gen8 code.
The way it works is there is a top level status register now which
informs the interrupt service routine which unit caused the interrupt,
and therefore which interrupt registers to read to process the
interrupt. For display the division is quite logical, a set of interrupt
registers for each pipe, and in addition to those, a set each for "misc"
and port.
For GT the things get a bit hairy, as seen by the code. Each of the GT
units has it's own bits defined. They all look *very similar* and
resides in 16 bits of a GT register. As an example, RCS and BCS share
register 0. To compact the code a bit, at a slight expense to
complexity, this is exactly how the code works as well. 2 structures are
added to the ring buffer so that our ring buffer interrupt handling code
knows which ring shares the interrupt registers, and a shift value (ie.
the top or bottom 16 bits of the register).
The above allows us to kept the interrupt register caching scheme, the
per interrupt enables, and the code to mask and unmask interrupts
relatively clean (again at the cost of some more complexity).
Most of the GT units mentioned above are command streamers, and so the
symmetry should work quite well for even the yet to be implemented rings
which Broadwell adds.
v2: Fixes up a couple of bugs, and is more verbose about errors in the
Broadwell interrupt handler.
v3: fix DE_MISC IER offset
v4: Simplify interrupts:
I totally misread the docs the first time I implemented interrupts, and
so this should greatly simplify the mess. Unlike GEN6, we never touch
the regular mask registers in irq_get/put.
v5: Rebased on to of recent pch hotplug setup changes.
v6: Fixup on top of moving num_pipes to intel_info.
v7: Rebased on top of Egbert Eich's hpd irq handling rework. Also
wired up ibx_hpd_irq_setup for gen8.
v8: Rebase on top of Jani's asle handling rework.
v9: Rebase on top of Ben's VECS enabling for Haswell, where he
unfortunately went OCD on the gt irq #defines. Not that they're still
not yet fully consistent:
- Used the GT_RENDER_ #defines + bdw shifts.
- Dropped the shift from the L3_PARITY stuff, seemed clearer.
- s/irq_refcount/irq_refcount.gt/
v10: Squash in VECS enabling patches and the gen8_gt_irq_handler
refactoring from Zhao Yakui <yakui.zhao@intel.com>
v11: Rebase on top of the interrupt cleanups in upstream.
v12: Rebase on top of Ben's DPF changes in upstream.
v13: Drop bdw from the HAS_L3_DPF feature flag for now, it's unclear what
exactly needs to be done. Requested by Ben.
v14: Fix the patch.
- Drop the mask of reserved bits and assorted logic, it doesn't match
the spec.
- Do the posting read inconditionally instead of commenting it out.
- Add a GEN8_MASTER_IRQ_CONTROL definition and use it.
- Fix up the GEN8_PIPE interrupt defines and give the GEN8_ prefixes -
we actually will need to use them.
- Enclose macros in do {} while (0) (checkpatch).
- Clear DE_MISC interrupt bits only after having processed them.
- Fix whitespace fail (checkpatch).
- Fix overtly long lines where appropriate (checkpatch).
- Don't use typedef'ed private_t (maintainer-scripts).
- Align the function parameter list correctly.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v4)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
bikeshed
2013-11-03 04:07:09 +00:00
|
|
|
#define GEN8_GT_VCS2_IRQ (1<<3)
|
|
|
|
#define GEN8_GT_VCS1_IRQ (1<<2)
|
|
|
|
#define GEN8_GT_BCS_IRQ (1<<1)
|
|
|
|
#define GEN8_GT_RCS_IRQ (1<<0)
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN8_GT_ISR(which) _MMIO(0x44300 + (0x10 * (which)))
|
|
|
|
#define GEN8_GT_IMR(which) _MMIO(0x44304 + (0x10 * (which)))
|
|
|
|
#define GEN8_GT_IIR(which) _MMIO(0x44308 + (0x10 * (which)))
|
|
|
|
#define GEN8_GT_IER(which) _MMIO(0x4430c + (0x10 * (which)))
|
drm/i915/bdw: Implement interrupt changes
The interrupt handling implementation remains the same as previous
generations with the 4 types of registers, status, identity, mask, and
enable. However the layout of where the bits go have changed entirely.
To address these changes, all of the interrupt vfuncs needed special
gen8 code.
The way it works is there is a top level status register now which
informs the interrupt service routine which unit caused the interrupt,
and therefore which interrupt registers to read to process the
interrupt. For display the division is quite logical, a set of interrupt
registers for each pipe, and in addition to those, a set each for "misc"
and port.
For GT the things get a bit hairy, as seen by the code. Each of the GT
units has it's own bits defined. They all look *very similar* and
resides in 16 bits of a GT register. As an example, RCS and BCS share
register 0. To compact the code a bit, at a slight expense to
complexity, this is exactly how the code works as well. 2 structures are
added to the ring buffer so that our ring buffer interrupt handling code
knows which ring shares the interrupt registers, and a shift value (ie.
the top or bottom 16 bits of the register).
The above allows us to kept the interrupt register caching scheme, the
per interrupt enables, and the code to mask and unmask interrupts
relatively clean (again at the cost of some more complexity).
Most of the GT units mentioned above are command streamers, and so the
symmetry should work quite well for even the yet to be implemented rings
which Broadwell adds.
v2: Fixes up a couple of bugs, and is more verbose about errors in the
Broadwell interrupt handler.
v3: fix DE_MISC IER offset
v4: Simplify interrupts:
I totally misread the docs the first time I implemented interrupts, and
so this should greatly simplify the mess. Unlike GEN6, we never touch
the regular mask registers in irq_get/put.
v5: Rebased on to of recent pch hotplug setup changes.
v6: Fixup on top of moving num_pipes to intel_info.
v7: Rebased on top of Egbert Eich's hpd irq handling rework. Also
wired up ibx_hpd_irq_setup for gen8.
v8: Rebase on top of Jani's asle handling rework.
v9: Rebase on top of Ben's VECS enabling for Haswell, where he
unfortunately went OCD on the gt irq #defines. Not that they're still
not yet fully consistent:
- Used the GT_RENDER_ #defines + bdw shifts.
- Dropped the shift from the L3_PARITY stuff, seemed clearer.
- s/irq_refcount/irq_refcount.gt/
v10: Squash in VECS enabling patches and the gen8_gt_irq_handler
refactoring from Zhao Yakui <yakui.zhao@intel.com>
v11: Rebase on top of the interrupt cleanups in upstream.
v12: Rebase on top of Ben's DPF changes in upstream.
v13: Drop bdw from the HAS_L3_DPF feature flag for now, it's unclear what
exactly needs to be done. Requested by Ben.
v14: Fix the patch.
- Drop the mask of reserved bits and assorted logic, it doesn't match
the spec.
- Do the posting read inconditionally instead of commenting it out.
- Add a GEN8_MASTER_IRQ_CONTROL definition and use it.
- Fix up the GEN8_PIPE interrupt defines and give the GEN8_ prefixes -
we actually will need to use them.
- Enclose macros in do {} while (0) (checkpatch).
- Clear DE_MISC interrupt bits only after having processed them.
- Fix whitespace fail (checkpatch).
- Fix overtly long lines where appropriate (checkpatch).
- Don't use typedef'ed private_t (maintainer-scripts).
- Align the function parameter list correctly.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v4)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
bikeshed
2013-11-03 04:07:09 +00:00
|
|
|
|
|
|
|
#define GEN8_RCS_IRQ_SHIFT 0
|
2015-08-12 14:43:42 +00:00
|
|
|
#define GEN8_BCS_IRQ_SHIFT 16
|
drm/i915/bdw: Implement interrupt changes
The interrupt handling implementation remains the same as previous
generations with the 4 types of registers, status, identity, mask, and
enable. However the layout of where the bits go have changed entirely.
To address these changes, all of the interrupt vfuncs needed special
gen8 code.
The way it works is there is a top level status register now which
informs the interrupt service routine which unit caused the interrupt,
and therefore which interrupt registers to read to process the
interrupt. For display the division is quite logical, a set of interrupt
registers for each pipe, and in addition to those, a set each for "misc"
and port.
For GT the things get a bit hairy, as seen by the code. Each of the GT
units has it's own bits defined. They all look *very similar* and
resides in 16 bits of a GT register. As an example, RCS and BCS share
register 0. To compact the code a bit, at a slight expense to
complexity, this is exactly how the code works as well. 2 structures are
added to the ring buffer so that our ring buffer interrupt handling code
knows which ring shares the interrupt registers, and a shift value (ie.
the top or bottom 16 bits of the register).
The above allows us to kept the interrupt register caching scheme, the
per interrupt enables, and the code to mask and unmask interrupts
relatively clean (again at the cost of some more complexity).
Most of the GT units mentioned above are command streamers, and so the
symmetry should work quite well for even the yet to be implemented rings
which Broadwell adds.
v2: Fixes up a couple of bugs, and is more verbose about errors in the
Broadwell interrupt handler.
v3: fix DE_MISC IER offset
v4: Simplify interrupts:
I totally misread the docs the first time I implemented interrupts, and
so this should greatly simplify the mess. Unlike GEN6, we never touch
the regular mask registers in irq_get/put.
v5: Rebased on to of recent pch hotplug setup changes.
v6: Fixup on top of moving num_pipes to intel_info.
v7: Rebased on top of Egbert Eich's hpd irq handling rework. Also
wired up ibx_hpd_irq_setup for gen8.
v8: Rebase on top of Jani's asle handling rework.
v9: Rebase on top of Ben's VECS enabling for Haswell, where he
unfortunately went OCD on the gt irq #defines. Not that they're still
not yet fully consistent:
- Used the GT_RENDER_ #defines + bdw shifts.
- Dropped the shift from the L3_PARITY stuff, seemed clearer.
- s/irq_refcount/irq_refcount.gt/
v10: Squash in VECS enabling patches and the gen8_gt_irq_handler
refactoring from Zhao Yakui <yakui.zhao@intel.com>
v11: Rebase on top of the interrupt cleanups in upstream.
v12: Rebase on top of Ben's DPF changes in upstream.
v13: Drop bdw from the HAS_L3_DPF feature flag for now, it's unclear what
exactly needs to be done. Requested by Ben.
v14: Fix the patch.
- Drop the mask of reserved bits and assorted logic, it doesn't match
the spec.
- Do the posting read inconditionally instead of commenting it out.
- Add a GEN8_MASTER_IRQ_CONTROL definition and use it.
- Fix up the GEN8_PIPE interrupt defines and give the GEN8_ prefixes -
we actually will need to use them.
- Enclose macros in do {} while (0) (checkpatch).
- Clear DE_MISC interrupt bits only after having processed them.
- Fix whitespace fail (checkpatch).
- Fix overtly long lines where appropriate (checkpatch).
- Don't use typedef'ed private_t (maintainer-scripts).
- Align the function parameter list correctly.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v4)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
bikeshed
2013-11-03 04:07:09 +00:00
|
|
|
#define GEN8_VCS1_IRQ_SHIFT 0
|
2015-08-12 14:43:42 +00:00
|
|
|
#define GEN8_VCS2_IRQ_SHIFT 16
|
drm/i915/bdw: Implement interrupt changes
The interrupt handling implementation remains the same as previous
generations with the 4 types of registers, status, identity, mask, and
enable. However the layout of where the bits go have changed entirely.
To address these changes, all of the interrupt vfuncs needed special
gen8 code.
The way it works is there is a top level status register now which
informs the interrupt service routine which unit caused the interrupt,
and therefore which interrupt registers to read to process the
interrupt. For display the division is quite logical, a set of interrupt
registers for each pipe, and in addition to those, a set each for "misc"
and port.
For GT the things get a bit hairy, as seen by the code. Each of the GT
units has it's own bits defined. They all look *very similar* and
resides in 16 bits of a GT register. As an example, RCS and BCS share
register 0. To compact the code a bit, at a slight expense to
complexity, this is exactly how the code works as well. 2 structures are
added to the ring buffer so that our ring buffer interrupt handling code
knows which ring shares the interrupt registers, and a shift value (ie.
the top or bottom 16 bits of the register).
The above allows us to kept the interrupt register caching scheme, the
per interrupt enables, and the code to mask and unmask interrupts
relatively clean (again at the cost of some more complexity).
Most of the GT units mentioned above are command streamers, and so the
symmetry should work quite well for even the yet to be implemented rings
which Broadwell adds.
v2: Fixes up a couple of bugs, and is more verbose about errors in the
Broadwell interrupt handler.
v3: fix DE_MISC IER offset
v4: Simplify interrupts:
I totally misread the docs the first time I implemented interrupts, and
so this should greatly simplify the mess. Unlike GEN6, we never touch
the regular mask registers in irq_get/put.
v5: Rebased on to of recent pch hotplug setup changes.
v6: Fixup on top of moving num_pipes to intel_info.
v7: Rebased on top of Egbert Eich's hpd irq handling rework. Also
wired up ibx_hpd_irq_setup for gen8.
v8: Rebase on top of Jani's asle handling rework.
v9: Rebase on top of Ben's VECS enabling for Haswell, where he
unfortunately went OCD on the gt irq #defines. Not that they're still
not yet fully consistent:
- Used the GT_RENDER_ #defines + bdw shifts.
- Dropped the shift from the L3_PARITY stuff, seemed clearer.
- s/irq_refcount/irq_refcount.gt/
v10: Squash in VECS enabling patches and the gen8_gt_irq_handler
refactoring from Zhao Yakui <yakui.zhao@intel.com>
v11: Rebase on top of the interrupt cleanups in upstream.
v12: Rebase on top of Ben's DPF changes in upstream.
v13: Drop bdw from the HAS_L3_DPF feature flag for now, it's unclear what
exactly needs to be done. Requested by Ben.
v14: Fix the patch.
- Drop the mask of reserved bits and assorted logic, it doesn't match
the spec.
- Do the posting read inconditionally instead of commenting it out.
- Add a GEN8_MASTER_IRQ_CONTROL definition and use it.
- Fix up the GEN8_PIPE interrupt defines and give the GEN8_ prefixes -
we actually will need to use them.
- Enclose macros in do {} while (0) (checkpatch).
- Clear DE_MISC interrupt bits only after having processed them.
- Fix whitespace fail (checkpatch).
- Fix overtly long lines where appropriate (checkpatch).
- Don't use typedef'ed private_t (maintainer-scripts).
- Align the function parameter list correctly.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v4)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
bikeshed
2013-11-03 04:07:09 +00:00
|
|
|
#define GEN8_VECS_IRQ_SHIFT 0
|
2015-08-12 14:43:42 +00:00
|
|
|
#define GEN8_WD_IRQ_SHIFT 16
|
drm/i915/bdw: Implement interrupt changes
The interrupt handling implementation remains the same as previous
generations with the 4 types of registers, status, identity, mask, and
enable. However the layout of where the bits go have changed entirely.
To address these changes, all of the interrupt vfuncs needed special
gen8 code.
The way it works is there is a top level status register now which
informs the interrupt service routine which unit caused the interrupt,
and therefore which interrupt registers to read to process the
interrupt. For display the division is quite logical, a set of interrupt
registers for each pipe, and in addition to those, a set each for "misc"
and port.
For GT the things get a bit hairy, as seen by the code. Each of the GT
units has it's own bits defined. They all look *very similar* and
resides in 16 bits of a GT register. As an example, RCS and BCS share
register 0. To compact the code a bit, at a slight expense to
complexity, this is exactly how the code works as well. 2 structures are
added to the ring buffer so that our ring buffer interrupt handling code
knows which ring shares the interrupt registers, and a shift value (ie.
the top or bottom 16 bits of the register).
The above allows us to kept the interrupt register caching scheme, the
per interrupt enables, and the code to mask and unmask interrupts
relatively clean (again at the cost of some more complexity).
Most of the GT units mentioned above are command streamers, and so the
symmetry should work quite well for even the yet to be implemented rings
which Broadwell adds.
v2: Fixes up a couple of bugs, and is more verbose about errors in the
Broadwell interrupt handler.
v3: fix DE_MISC IER offset
v4: Simplify interrupts:
I totally misread the docs the first time I implemented interrupts, and
so this should greatly simplify the mess. Unlike GEN6, we never touch
the regular mask registers in irq_get/put.
v5: Rebased on to of recent pch hotplug setup changes.
v6: Fixup on top of moving num_pipes to intel_info.
v7: Rebased on top of Egbert Eich's hpd irq handling rework. Also
wired up ibx_hpd_irq_setup for gen8.
v8: Rebase on top of Jani's asle handling rework.
v9: Rebase on top of Ben's VECS enabling for Haswell, where he
unfortunately went OCD on the gt irq #defines. Not that they're still
not yet fully consistent:
- Used the GT_RENDER_ #defines + bdw shifts.
- Dropped the shift from the L3_PARITY stuff, seemed clearer.
- s/irq_refcount/irq_refcount.gt/
v10: Squash in VECS enabling patches and the gen8_gt_irq_handler
refactoring from Zhao Yakui <yakui.zhao@intel.com>
v11: Rebase on top of the interrupt cleanups in upstream.
v12: Rebase on top of Ben's DPF changes in upstream.
v13: Drop bdw from the HAS_L3_DPF feature flag for now, it's unclear what
exactly needs to be done. Requested by Ben.
v14: Fix the patch.
- Drop the mask of reserved bits and assorted logic, it doesn't match
the spec.
- Do the posting read inconditionally instead of commenting it out.
- Add a GEN8_MASTER_IRQ_CONTROL definition and use it.
- Fix up the GEN8_PIPE interrupt defines and give the GEN8_ prefixes -
we actually will need to use them.
- Enclose macros in do {} while (0) (checkpatch).
- Clear DE_MISC interrupt bits only after having processed them.
- Fix whitespace fail (checkpatch).
- Fix overtly long lines where appropriate (checkpatch).
- Don't use typedef'ed private_t (maintainer-scripts).
- Align the function parameter list correctly.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v4)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
bikeshed
2013-11-03 04:07:09 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN8_DE_PIPE_ISR(pipe) _MMIO(0x44400 + (0x10 * (pipe)))
|
|
|
|
#define GEN8_DE_PIPE_IMR(pipe) _MMIO(0x44404 + (0x10 * (pipe)))
|
|
|
|
#define GEN8_DE_PIPE_IIR(pipe) _MMIO(0x44408 + (0x10 * (pipe)))
|
|
|
|
#define GEN8_DE_PIPE_IER(pipe) _MMIO(0x4440c + (0x10 * (pipe)))
|
2013-11-07 10:05:46 +00:00
|
|
|
#define GEN8_PIPE_FIFO_UNDERRUN (1 << 31)
|
drm/i915/bdw: Implement interrupt changes
The interrupt handling implementation remains the same as previous
generations with the 4 types of registers, status, identity, mask, and
enable. However the layout of where the bits go have changed entirely.
To address these changes, all of the interrupt vfuncs needed special
gen8 code.
The way it works is there is a top level status register now which
informs the interrupt service routine which unit caused the interrupt,
and therefore which interrupt registers to read to process the
interrupt. For display the division is quite logical, a set of interrupt
registers for each pipe, and in addition to those, a set each for "misc"
and port.
For GT the things get a bit hairy, as seen by the code. Each of the GT
units has it's own bits defined. They all look *very similar* and
resides in 16 bits of a GT register. As an example, RCS and BCS share
register 0. To compact the code a bit, at a slight expense to
complexity, this is exactly how the code works as well. 2 structures are
added to the ring buffer so that our ring buffer interrupt handling code
knows which ring shares the interrupt registers, and a shift value (ie.
the top or bottom 16 bits of the register).
The above allows us to kept the interrupt register caching scheme, the
per interrupt enables, and the code to mask and unmask interrupts
relatively clean (again at the cost of some more complexity).
Most of the GT units mentioned above are command streamers, and so the
symmetry should work quite well for even the yet to be implemented rings
which Broadwell adds.
v2: Fixes up a couple of bugs, and is more verbose about errors in the
Broadwell interrupt handler.
v3: fix DE_MISC IER offset
v4: Simplify interrupts:
I totally misread the docs the first time I implemented interrupts, and
so this should greatly simplify the mess. Unlike GEN6, we never touch
the regular mask registers in irq_get/put.
v5: Rebased on to of recent pch hotplug setup changes.
v6: Fixup on top of moving num_pipes to intel_info.
v7: Rebased on top of Egbert Eich's hpd irq handling rework. Also
wired up ibx_hpd_irq_setup for gen8.
v8: Rebase on top of Jani's asle handling rework.
v9: Rebase on top of Ben's VECS enabling for Haswell, where he
unfortunately went OCD on the gt irq #defines. Not that they're still
not yet fully consistent:
- Used the GT_RENDER_ #defines + bdw shifts.
- Dropped the shift from the L3_PARITY stuff, seemed clearer.
- s/irq_refcount/irq_refcount.gt/
v10: Squash in VECS enabling patches and the gen8_gt_irq_handler
refactoring from Zhao Yakui <yakui.zhao@intel.com>
v11: Rebase on top of the interrupt cleanups in upstream.
v12: Rebase on top of Ben's DPF changes in upstream.
v13: Drop bdw from the HAS_L3_DPF feature flag for now, it's unclear what
exactly needs to be done. Requested by Ben.
v14: Fix the patch.
- Drop the mask of reserved bits and assorted logic, it doesn't match
the spec.
- Do the posting read inconditionally instead of commenting it out.
- Add a GEN8_MASTER_IRQ_CONTROL definition and use it.
- Fix up the GEN8_PIPE interrupt defines and give the GEN8_ prefixes -
we actually will need to use them.
- Enclose macros in do {} while (0) (checkpatch).
- Clear DE_MISC interrupt bits only after having processed them.
- Fix whitespace fail (checkpatch).
- Fix overtly long lines where appropriate (checkpatch).
- Don't use typedef'ed private_t (maintainer-scripts).
- Align the function parameter list correctly.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v4)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
bikeshed
2013-11-03 04:07:09 +00:00
|
|
|
#define GEN8_PIPE_CDCLK_CRC_ERROR (1 << 29)
|
|
|
|
#define GEN8_PIPE_CDCLK_CRC_DONE (1 << 28)
|
|
|
|
#define GEN8_PIPE_CURSOR_FAULT (1 << 10)
|
|
|
|
#define GEN8_PIPE_SPRITE_FAULT (1 << 9)
|
|
|
|
#define GEN8_PIPE_PRIMARY_FAULT (1 << 8)
|
|
|
|
#define GEN8_PIPE_SPRITE_FLIP_DONE (1 << 5)
|
2014-04-08 00:22:44 +00:00
|
|
|
#define GEN8_PIPE_PRIMARY_FLIP_DONE (1 << 4)
|
drm/i915/bdw: Implement interrupt changes
The interrupt handling implementation remains the same as previous
generations with the 4 types of registers, status, identity, mask, and
enable. However the layout of where the bits go have changed entirely.
To address these changes, all of the interrupt vfuncs needed special
gen8 code.
The way it works is there is a top level status register now which
informs the interrupt service routine which unit caused the interrupt,
and therefore which interrupt registers to read to process the
interrupt. For display the division is quite logical, a set of interrupt
registers for each pipe, and in addition to those, a set each for "misc"
and port.
For GT the things get a bit hairy, as seen by the code. Each of the GT
units has it's own bits defined. They all look *very similar* and
resides in 16 bits of a GT register. As an example, RCS and BCS share
register 0. To compact the code a bit, at a slight expense to
complexity, this is exactly how the code works as well. 2 structures are
added to the ring buffer so that our ring buffer interrupt handling code
knows which ring shares the interrupt registers, and a shift value (ie.
the top or bottom 16 bits of the register).
The above allows us to kept the interrupt register caching scheme, the
per interrupt enables, and the code to mask and unmask interrupts
relatively clean (again at the cost of some more complexity).
Most of the GT units mentioned above are command streamers, and so the
symmetry should work quite well for even the yet to be implemented rings
which Broadwell adds.
v2: Fixes up a couple of bugs, and is more verbose about errors in the
Broadwell interrupt handler.
v3: fix DE_MISC IER offset
v4: Simplify interrupts:
I totally misread the docs the first time I implemented interrupts, and
so this should greatly simplify the mess. Unlike GEN6, we never touch
the regular mask registers in irq_get/put.
v5: Rebased on to of recent pch hotplug setup changes.
v6: Fixup on top of moving num_pipes to intel_info.
v7: Rebased on top of Egbert Eich's hpd irq handling rework. Also
wired up ibx_hpd_irq_setup for gen8.
v8: Rebase on top of Jani's asle handling rework.
v9: Rebase on top of Ben's VECS enabling for Haswell, where he
unfortunately went OCD on the gt irq #defines. Not that they're still
not yet fully consistent:
- Used the GT_RENDER_ #defines + bdw shifts.
- Dropped the shift from the L3_PARITY stuff, seemed clearer.
- s/irq_refcount/irq_refcount.gt/
v10: Squash in VECS enabling patches and the gen8_gt_irq_handler
refactoring from Zhao Yakui <yakui.zhao@intel.com>
v11: Rebase on top of the interrupt cleanups in upstream.
v12: Rebase on top of Ben's DPF changes in upstream.
v13: Drop bdw from the HAS_L3_DPF feature flag for now, it's unclear what
exactly needs to be done. Requested by Ben.
v14: Fix the patch.
- Drop the mask of reserved bits and assorted logic, it doesn't match
the spec.
- Do the posting read inconditionally instead of commenting it out.
- Add a GEN8_MASTER_IRQ_CONTROL definition and use it.
- Fix up the GEN8_PIPE interrupt defines and give the GEN8_ prefixes -
we actually will need to use them.
- Enclose macros in do {} while (0) (checkpatch).
- Clear DE_MISC interrupt bits only after having processed them.
- Fix whitespace fail (checkpatch).
- Fix overtly long lines where appropriate (checkpatch).
- Don't use typedef'ed private_t (maintainer-scripts).
- Align the function parameter list correctly.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v4)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
bikeshed
2013-11-03 04:07:09 +00:00
|
|
|
#define GEN8_PIPE_SCAN_LINE_EVENT (1 << 2)
|
|
|
|
#define GEN8_PIPE_VSYNC (1 << 1)
|
|
|
|
#define GEN8_PIPE_VBLANK (1 << 0)
|
2014-03-20 20:45:01 +00:00
|
|
|
#define GEN9_PIPE_CURSOR_FAULT (1 << 11)
|
2015-03-17 09:39:33 +00:00
|
|
|
#define GEN9_PIPE_PLANE4_FAULT (1 << 10)
|
2014-03-20 20:45:01 +00:00
|
|
|
#define GEN9_PIPE_PLANE3_FAULT (1 << 9)
|
|
|
|
#define GEN9_PIPE_PLANE2_FAULT (1 << 8)
|
|
|
|
#define GEN9_PIPE_PLANE1_FAULT (1 << 7)
|
2015-03-17 09:39:33 +00:00
|
|
|
#define GEN9_PIPE_PLANE4_FLIP_DONE (1 << 6)
|
2014-03-20 20:45:01 +00:00
|
|
|
#define GEN9_PIPE_PLANE3_FLIP_DONE (1 << 5)
|
|
|
|
#define GEN9_PIPE_PLANE2_FLIP_DONE (1 << 4)
|
|
|
|
#define GEN9_PIPE_PLANE1_FLIP_DONE (1 << 3)
|
2015-09-18 17:03:39 +00:00
|
|
|
#define GEN9_PIPE_PLANE_FLIP_DONE(p) (1 << (3 + (p)))
|
2013-11-07 13:49:24 +00:00
|
|
|
#define GEN8_DE_PIPE_IRQ_FAULT_ERRORS \
|
|
|
|
(GEN8_PIPE_CURSOR_FAULT | \
|
|
|
|
GEN8_PIPE_SPRITE_FAULT | \
|
|
|
|
GEN8_PIPE_PRIMARY_FAULT)
|
2014-03-20 20:45:01 +00:00
|
|
|
#define GEN9_DE_PIPE_IRQ_FAULT_ERRORS \
|
|
|
|
(GEN9_PIPE_CURSOR_FAULT | \
|
2015-03-17 09:39:33 +00:00
|
|
|
GEN9_PIPE_PLANE4_FAULT | \
|
2014-03-20 20:45:01 +00:00
|
|
|
GEN9_PIPE_PLANE3_FAULT | \
|
|
|
|
GEN9_PIPE_PLANE2_FAULT | \
|
|
|
|
GEN9_PIPE_PLANE1_FAULT)
|
drm/i915/bdw: Implement interrupt changes
The interrupt handling implementation remains the same as previous
generations with the 4 types of registers, status, identity, mask, and
enable. However the layout of where the bits go have changed entirely.
To address these changes, all of the interrupt vfuncs needed special
gen8 code.
The way it works is there is a top level status register now which
informs the interrupt service routine which unit caused the interrupt,
and therefore which interrupt registers to read to process the
interrupt. For display the division is quite logical, a set of interrupt
registers for each pipe, and in addition to those, a set each for "misc"
and port.
For GT the things get a bit hairy, as seen by the code. Each of the GT
units has it's own bits defined. They all look *very similar* and
resides in 16 bits of a GT register. As an example, RCS and BCS share
register 0. To compact the code a bit, at a slight expense to
complexity, this is exactly how the code works as well. 2 structures are
added to the ring buffer so that our ring buffer interrupt handling code
knows which ring shares the interrupt registers, and a shift value (ie.
the top or bottom 16 bits of the register).
The above allows us to kept the interrupt register caching scheme, the
per interrupt enables, and the code to mask and unmask interrupts
relatively clean (again at the cost of some more complexity).
Most of the GT units mentioned above are command streamers, and so the
symmetry should work quite well for even the yet to be implemented rings
which Broadwell adds.
v2: Fixes up a couple of bugs, and is more verbose about errors in the
Broadwell interrupt handler.
v3: fix DE_MISC IER offset
v4: Simplify interrupts:
I totally misread the docs the first time I implemented interrupts, and
so this should greatly simplify the mess. Unlike GEN6, we never touch
the regular mask registers in irq_get/put.
v5: Rebased on to of recent pch hotplug setup changes.
v6: Fixup on top of moving num_pipes to intel_info.
v7: Rebased on top of Egbert Eich's hpd irq handling rework. Also
wired up ibx_hpd_irq_setup for gen8.
v8: Rebase on top of Jani's asle handling rework.
v9: Rebase on top of Ben's VECS enabling for Haswell, where he
unfortunately went OCD on the gt irq #defines. Not that they're still
not yet fully consistent:
- Used the GT_RENDER_ #defines + bdw shifts.
- Dropped the shift from the L3_PARITY stuff, seemed clearer.
- s/irq_refcount/irq_refcount.gt/
v10: Squash in VECS enabling patches and the gen8_gt_irq_handler
refactoring from Zhao Yakui <yakui.zhao@intel.com>
v11: Rebase on top of the interrupt cleanups in upstream.
v12: Rebase on top of Ben's DPF changes in upstream.
v13: Drop bdw from the HAS_L3_DPF feature flag for now, it's unclear what
exactly needs to be done. Requested by Ben.
v14: Fix the patch.
- Drop the mask of reserved bits and assorted logic, it doesn't match
the spec.
- Do the posting read inconditionally instead of commenting it out.
- Add a GEN8_MASTER_IRQ_CONTROL definition and use it.
- Fix up the GEN8_PIPE interrupt defines and give the GEN8_ prefixes -
we actually will need to use them.
- Enclose macros in do {} while (0) (checkpatch).
- Clear DE_MISC interrupt bits only after having processed them.
- Fix whitespace fail (checkpatch).
- Fix overtly long lines where appropriate (checkpatch).
- Don't use typedef'ed private_t (maintainer-scripts).
- Align the function parameter list correctly.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v4)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
bikeshed
2013-11-03 04:07:09 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN8_DE_PORT_ISR _MMIO(0x44440)
|
|
|
|
#define GEN8_DE_PORT_IMR _MMIO(0x44444)
|
|
|
|
#define GEN8_DE_PORT_IIR _MMIO(0x44448)
|
|
|
|
#define GEN8_DE_PORT_IER _MMIO(0x4444c)
|
2014-11-13 17:51:48 +00:00
|
|
|
#define GEN9_AUX_CHANNEL_D (1 << 27)
|
|
|
|
#define GEN9_AUX_CHANNEL_C (1 << 26)
|
|
|
|
#define GEN9_AUX_CHANNEL_B (1 << 25)
|
2015-03-27 12:54:14 +00:00
|
|
|
#define BXT_DE_PORT_HP_DDIC (1 << 5)
|
|
|
|
#define BXT_DE_PORT_HP_DDIB (1 << 4)
|
|
|
|
#define BXT_DE_PORT_HP_DDIA (1 << 3)
|
|
|
|
#define BXT_DE_PORT_HOTPLUG_MASK (BXT_DE_PORT_HP_DDIA | \
|
|
|
|
BXT_DE_PORT_HP_DDIB | \
|
|
|
|
BXT_DE_PORT_HP_DDIC)
|
|
|
|
#define GEN8_PORT_DP_A_HOTPLUG (1 << 3)
|
2014-08-22 12:10:43 +00:00
|
|
|
#define BXT_DE_PORT_GMBUS (1 << 1)
|
2013-11-07 13:49:55 +00:00
|
|
|
#define GEN8_AUX_CHANNEL_A (1 << 0)
|
drm/i915/bdw: Implement interrupt changes
The interrupt handling implementation remains the same as previous
generations with the 4 types of registers, status, identity, mask, and
enable. However the layout of where the bits go have changed entirely.
To address these changes, all of the interrupt vfuncs needed special
gen8 code.
The way it works is there is a top level status register now which
informs the interrupt service routine which unit caused the interrupt,
and therefore which interrupt registers to read to process the
interrupt. For display the division is quite logical, a set of interrupt
registers for each pipe, and in addition to those, a set each for "misc"
and port.
For GT the things get a bit hairy, as seen by the code. Each of the GT
units has it's own bits defined. They all look *very similar* and
resides in 16 bits of a GT register. As an example, RCS and BCS share
register 0. To compact the code a bit, at a slight expense to
complexity, this is exactly how the code works as well. 2 structures are
added to the ring buffer so that our ring buffer interrupt handling code
knows which ring shares the interrupt registers, and a shift value (ie.
the top or bottom 16 bits of the register).
The above allows us to kept the interrupt register caching scheme, the
per interrupt enables, and the code to mask and unmask interrupts
relatively clean (again at the cost of some more complexity).
Most of the GT units mentioned above are command streamers, and so the
symmetry should work quite well for even the yet to be implemented rings
which Broadwell adds.
v2: Fixes up a couple of bugs, and is more verbose about errors in the
Broadwell interrupt handler.
v3: fix DE_MISC IER offset
v4: Simplify interrupts:
I totally misread the docs the first time I implemented interrupts, and
so this should greatly simplify the mess. Unlike GEN6, we never touch
the regular mask registers in irq_get/put.
v5: Rebased on to of recent pch hotplug setup changes.
v6: Fixup on top of moving num_pipes to intel_info.
v7: Rebased on top of Egbert Eich's hpd irq handling rework. Also
wired up ibx_hpd_irq_setup for gen8.
v8: Rebase on top of Jani's asle handling rework.
v9: Rebase on top of Ben's VECS enabling for Haswell, where he
unfortunately went OCD on the gt irq #defines. Not that they're still
not yet fully consistent:
- Used the GT_RENDER_ #defines + bdw shifts.
- Dropped the shift from the L3_PARITY stuff, seemed clearer.
- s/irq_refcount/irq_refcount.gt/
v10: Squash in VECS enabling patches and the gen8_gt_irq_handler
refactoring from Zhao Yakui <yakui.zhao@intel.com>
v11: Rebase on top of the interrupt cleanups in upstream.
v12: Rebase on top of Ben's DPF changes in upstream.
v13: Drop bdw from the HAS_L3_DPF feature flag for now, it's unclear what
exactly needs to be done. Requested by Ben.
v14: Fix the patch.
- Drop the mask of reserved bits and assorted logic, it doesn't match
the spec.
- Do the posting read inconditionally instead of commenting it out.
- Add a GEN8_MASTER_IRQ_CONTROL definition and use it.
- Fix up the GEN8_PIPE interrupt defines and give the GEN8_ prefixes -
we actually will need to use them.
- Enclose macros in do {} while (0) (checkpatch).
- Clear DE_MISC interrupt bits only after having processed them.
- Fix whitespace fail (checkpatch).
- Fix overtly long lines where appropriate (checkpatch).
- Don't use typedef'ed private_t (maintainer-scripts).
- Align the function parameter list correctly.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v4)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
bikeshed
2013-11-03 04:07:09 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN8_DE_MISC_ISR _MMIO(0x44460)
|
|
|
|
#define GEN8_DE_MISC_IMR _MMIO(0x44464)
|
|
|
|
#define GEN8_DE_MISC_IIR _MMIO(0x44468)
|
|
|
|
#define GEN8_DE_MISC_IER _MMIO(0x4446c)
|
drm/i915/bdw: Implement interrupt changes
The interrupt handling implementation remains the same as previous
generations with the 4 types of registers, status, identity, mask, and
enable. However the layout of where the bits go have changed entirely.
To address these changes, all of the interrupt vfuncs needed special
gen8 code.
The way it works is there is a top level status register now which
informs the interrupt service routine which unit caused the interrupt,
and therefore which interrupt registers to read to process the
interrupt. For display the division is quite logical, a set of interrupt
registers for each pipe, and in addition to those, a set each for "misc"
and port.
For GT the things get a bit hairy, as seen by the code. Each of the GT
units has it's own bits defined. They all look *very similar* and
resides in 16 bits of a GT register. As an example, RCS and BCS share
register 0. To compact the code a bit, at a slight expense to
complexity, this is exactly how the code works as well. 2 structures are
added to the ring buffer so that our ring buffer interrupt handling code
knows which ring shares the interrupt registers, and a shift value (ie.
the top or bottom 16 bits of the register).
The above allows us to kept the interrupt register caching scheme, the
per interrupt enables, and the code to mask and unmask interrupts
relatively clean (again at the cost of some more complexity).
Most of the GT units mentioned above are command streamers, and so the
symmetry should work quite well for even the yet to be implemented rings
which Broadwell adds.
v2: Fixes up a couple of bugs, and is more verbose about errors in the
Broadwell interrupt handler.
v3: fix DE_MISC IER offset
v4: Simplify interrupts:
I totally misread the docs the first time I implemented interrupts, and
so this should greatly simplify the mess. Unlike GEN6, we never touch
the regular mask registers in irq_get/put.
v5: Rebased on to of recent pch hotplug setup changes.
v6: Fixup on top of moving num_pipes to intel_info.
v7: Rebased on top of Egbert Eich's hpd irq handling rework. Also
wired up ibx_hpd_irq_setup for gen8.
v8: Rebase on top of Jani's asle handling rework.
v9: Rebase on top of Ben's VECS enabling for Haswell, where he
unfortunately went OCD on the gt irq #defines. Not that they're still
not yet fully consistent:
- Used the GT_RENDER_ #defines + bdw shifts.
- Dropped the shift from the L3_PARITY stuff, seemed clearer.
- s/irq_refcount/irq_refcount.gt/
v10: Squash in VECS enabling patches and the gen8_gt_irq_handler
refactoring from Zhao Yakui <yakui.zhao@intel.com>
v11: Rebase on top of the interrupt cleanups in upstream.
v12: Rebase on top of Ben's DPF changes in upstream.
v13: Drop bdw from the HAS_L3_DPF feature flag for now, it's unclear what
exactly needs to be done. Requested by Ben.
v14: Fix the patch.
- Drop the mask of reserved bits and assorted logic, it doesn't match
the spec.
- Do the posting read inconditionally instead of commenting it out.
- Add a GEN8_MASTER_IRQ_CONTROL definition and use it.
- Fix up the GEN8_PIPE interrupt defines and give the GEN8_ prefixes -
we actually will need to use them.
- Enclose macros in do {} while (0) (checkpatch).
- Clear DE_MISC interrupt bits only after having processed them.
- Fix whitespace fail (checkpatch).
- Fix overtly long lines where appropriate (checkpatch).
- Don't use typedef'ed private_t (maintainer-scripts).
- Align the function parameter list correctly.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v4)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
bikeshed
2013-11-03 04:07:09 +00:00
|
|
|
#define GEN8_DE_MISC_GSE (1 << 27)
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN8_PCU_ISR _MMIO(0x444e0)
|
|
|
|
#define GEN8_PCU_IMR _MMIO(0x444e4)
|
|
|
|
#define GEN8_PCU_IIR _MMIO(0x444e8)
|
|
|
|
#define GEN8_PCU_IER _MMIO(0x444ec)
|
drm/i915/bdw: Implement interrupt changes
The interrupt handling implementation remains the same as previous
generations with the 4 types of registers, status, identity, mask, and
enable. However the layout of where the bits go have changed entirely.
To address these changes, all of the interrupt vfuncs needed special
gen8 code.
The way it works is there is a top level status register now which
informs the interrupt service routine which unit caused the interrupt,
and therefore which interrupt registers to read to process the
interrupt. For display the division is quite logical, a set of interrupt
registers for each pipe, and in addition to those, a set each for "misc"
and port.
For GT the things get a bit hairy, as seen by the code. Each of the GT
units has it's own bits defined. They all look *very similar* and
resides in 16 bits of a GT register. As an example, RCS and BCS share
register 0. To compact the code a bit, at a slight expense to
complexity, this is exactly how the code works as well. 2 structures are
added to the ring buffer so that our ring buffer interrupt handling code
knows which ring shares the interrupt registers, and a shift value (ie.
the top or bottom 16 bits of the register).
The above allows us to kept the interrupt register caching scheme, the
per interrupt enables, and the code to mask and unmask interrupts
relatively clean (again at the cost of some more complexity).
Most of the GT units mentioned above are command streamers, and so the
symmetry should work quite well for even the yet to be implemented rings
which Broadwell adds.
v2: Fixes up a couple of bugs, and is more verbose about errors in the
Broadwell interrupt handler.
v3: fix DE_MISC IER offset
v4: Simplify interrupts:
I totally misread the docs the first time I implemented interrupts, and
so this should greatly simplify the mess. Unlike GEN6, we never touch
the regular mask registers in irq_get/put.
v5: Rebased on to of recent pch hotplug setup changes.
v6: Fixup on top of moving num_pipes to intel_info.
v7: Rebased on top of Egbert Eich's hpd irq handling rework. Also
wired up ibx_hpd_irq_setup for gen8.
v8: Rebase on top of Jani's asle handling rework.
v9: Rebase on top of Ben's VECS enabling for Haswell, where he
unfortunately went OCD on the gt irq #defines. Not that they're still
not yet fully consistent:
- Used the GT_RENDER_ #defines + bdw shifts.
- Dropped the shift from the L3_PARITY stuff, seemed clearer.
- s/irq_refcount/irq_refcount.gt/
v10: Squash in VECS enabling patches and the gen8_gt_irq_handler
refactoring from Zhao Yakui <yakui.zhao@intel.com>
v11: Rebase on top of the interrupt cleanups in upstream.
v12: Rebase on top of Ben's DPF changes in upstream.
v13: Drop bdw from the HAS_L3_DPF feature flag for now, it's unclear what
exactly needs to be done. Requested by Ben.
v14: Fix the patch.
- Drop the mask of reserved bits and assorted logic, it doesn't match
the spec.
- Do the posting read inconditionally instead of commenting it out.
- Add a GEN8_MASTER_IRQ_CONTROL definition and use it.
- Fix up the GEN8_PIPE interrupt defines and give the GEN8_ prefixes -
we actually will need to use them.
- Enclose macros in do {} while (0) (checkpatch).
- Clear DE_MISC interrupt bits only after having processed them.
- Fix whitespace fail (checkpatch).
- Fix overtly long lines where appropriate (checkpatch).
- Don't use typedef'ed private_t (maintainer-scripts).
- Align the function parameter list correctly.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v4)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
bikeshed
2013-11-03 04:07:09 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define ILK_DISPLAY_CHICKEN2 _MMIO(0x42004)
|
2010-11-06 21:53:33 +00:00
|
|
|
/* Required on all Ironlake and Sandybridge according to the B-Spec. */
|
|
|
|
#define ILK_ELPIN_409_SELECT (1 << 25)
|
2010-04-01 05:07:53 +00:00
|
|
|
#define ILK_DPARB_GATE (1<<22)
|
|
|
|
#define ILK_VSDPFD_FULL (1<<21)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define FUSE_STRAP _MMIO(0x42014)
|
2014-02-07 19:12:50 +00:00
|
|
|
#define ILK_INTERNAL_GRAPHICS_DISABLE (1 << 31)
|
|
|
|
#define ILK_INTERNAL_DISPLAY_DISABLE (1 << 30)
|
|
|
|
#define ILK_DISPLAY_DEBUG_DISABLE (1 << 29)
|
2016-01-22 11:28:45 +00:00
|
|
|
#define IVB_PIPE_C_DISABLE (1 << 28)
|
2014-02-07 19:12:50 +00:00
|
|
|
#define ILK_HDCP_DISABLE (1 << 25)
|
|
|
|
#define ILK_eDP_A_DISABLE (1 << 24)
|
|
|
|
#define HSW_CDCLK_LIMIT (1 << 24)
|
|
|
|
#define ILK_DESKTOP (1 << 23)
|
2012-10-19 16:55:41 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define ILK_DSPCLK_GATE_D _MMIO(0x42020)
|
2012-10-19 16:55:41 +00:00
|
|
|
#define ILK_VRHUNIT_CLOCK_GATE_DISABLE (1 << 28)
|
|
|
|
#define ILK_DPFCUNIT_CLOCK_GATE_DISABLE (1 << 9)
|
|
|
|
#define ILK_DPFCRUNIT_CLOCK_GATE_DISABLE (1 << 8)
|
|
|
|
#define ILK_DPFDUNIT_CLOCK_GATE_ENABLE (1 << 7)
|
|
|
|
#define ILK_DPARBUNIT_CLOCK_GATE_ENABLE (1 << 5)
|
2010-04-01 05:07:53 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define IVB_CHICKEN3 _MMIO(0x4200c)
|
2011-12-21 18:31:09 +00:00
|
|
|
# define CHICKEN3_DGMG_REQ_OUT_FIX_DISABLE (1 << 5)
|
|
|
|
# define CHICKEN3_DGMG_DONE_FIX_DISABLE (1 << 2)
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define CHICKEN_PAR1_1 _MMIO(0x42080)
|
2013-11-03 04:07:54 +00:00
|
|
|
#define DPA_MASK_VBLANK_SRD (1 << 15)
|
2013-05-03 20:23:45 +00:00
|
|
|
#define FORCE_ARB_IDLE_PLANES (1 << 14)
|
2016-05-19 07:14:20 +00:00
|
|
|
#define SKL_EDP_PSR_FIX_RDWRAP (1 << 3)
|
2013-05-03 20:23:45 +00:00
|
|
|
|
2013-11-03 04:07:54 +00:00
|
|
|
#define _CHICKEN_PIPESL_1_A 0x420b0
|
|
|
|
#define _CHICKEN_PIPESL_1_B 0x420b4
|
2014-03-05 11:05:47 +00:00
|
|
|
#define HSW_FBCQ_DIS (1 << 22)
|
|
|
|
#define BDW_DPRS_MASK_VBLANK_SRD (1 << 0)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define CHICKEN_PIPESL_1(pipe) _MMIO_PIPE(pipe, _CHICKEN_PIPESL_1_A, _CHICKEN_PIPESL_1_B)
|
2013-11-03 04:07:54 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define DISP_ARB_CTL _MMIO(0x45000)
|
2009-09-02 02:57:52 +00:00
|
|
|
#define DISP_TILE_SURFACE_SWIZZLING (1<<13)
|
2010-04-01 05:07:53 +00:00
|
|
|
#define DISP_FBC_WM_DIS (1<<15)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define DISP_ARB_CTL2 _MMIO(0x45004)
|
2013-12-05 13:51:28 +00:00
|
|
|
#define DISP_DATA_PARTITION_5_6 (1<<6)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define DBUF_CTL _MMIO(0x45008)
|
2014-11-24 08:07:39 +00:00
|
|
|
#define DBUF_POWER_REQUEST (1<<31)
|
|
|
|
#define DBUF_POWER_STATE (1<<30)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN7_MSG_CTL _MMIO(0x45010)
|
2013-04-05 20:12:43 +00:00
|
|
|
#define WAIT_FOR_PCH_RESET_ACK (1<<1)
|
|
|
|
#define WAIT_FOR_PCH_FLR_ACK (1<<0)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define HSW_NDE_RSTWRN_OPT _MMIO(0x46408)
|
2014-01-22 22:39:30 +00:00
|
|
|
#define RESET_PCH_HANDSHAKE_ENABLE (1<<4)
|
2009-09-02 02:57:52 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define SKL_DFSM _MMIO(0x51000)
|
2015-06-04 17:21:30 +00:00
|
|
|
#define SKL_DFSM_CDCLK_LIMIT_MASK (3 << 23)
|
|
|
|
#define SKL_DFSM_CDCLK_LIMIT_675 (0 << 23)
|
|
|
|
#define SKL_DFSM_CDCLK_LIMIT_540 (1 << 23)
|
|
|
|
#define SKL_DFSM_CDCLK_LIMIT_450 (2 << 23)
|
|
|
|
#define SKL_DFSM_CDCLK_LIMIT_337_5 (3 << 23)
|
2016-01-20 14:31:20 +00:00
|
|
|
#define SKL_DFSM_PIPE_A_DISABLE (1 << 30)
|
|
|
|
#define SKL_DFSM_PIPE_B_DISABLE (1 << 21)
|
|
|
|
#define SKL_DFSM_PIPE_C_DISABLE (1 << 28)
|
2015-06-04 17:21:30 +00:00
|
|
|
|
2016-01-21 21:43:53 +00:00
|
|
|
#define GEN7_FF_SLICE_CS_CHICKEN1 _MMIO(0x20e0)
|
|
|
|
#define GEN9_FFSC_PERCTX_PREEMPT_CTRL (1<<14)
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define FF_SLICE_CS_CHICKEN2 _MMIO(0x20e4)
|
2015-02-09 19:33:20 +00:00
|
|
|
#define GEN9_TSG_BARRIER_ACK_DISABLE (1<<8)
|
|
|
|
|
2016-01-21 21:43:50 +00:00
|
|
|
#define GEN9_CS_DEBUG_MODE1 _MMIO(0x20ec)
|
2016-01-21 21:43:48 +00:00
|
|
|
#define GEN8_CS_CHICKEN1 _MMIO(0x2580)
|
|
|
|
|
2012-02-08 20:53:50 +00:00
|
|
|
/* GEN7 chicken */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN7_COMMON_SLICE_CHICKEN1 _MMIO(0x7010)
|
2012-02-08 20:53:52 +00:00
|
|
|
# define GEN7_CSC1_RHWO_OPT_DISABLE_IN_RCC ((1<<10) | (1<<26))
|
2015-02-09 19:33:11 +00:00
|
|
|
# define GEN9_RHWO_OPTIMIZATION_DISABLE (1<<14)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define COMMON_SLICE_CHICKEN2 _MMIO(0x7014)
|
2013-11-03 04:07:59 +00:00
|
|
|
# define GEN8_CSC2_SBE_VUE_CACHE_CONSERVATIVE (1<<0)
|
2012-02-08 20:53:52 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define HIZ_CHICKEN _MMIO(0x7018)
|
2015-02-09 19:33:16 +00:00
|
|
|
# define CHV_HZ_8X8_MODE_IN_1X (1<<15)
|
|
|
|
# define BDW_HIZ_POWER_COMPILER_CLOCK_GATING_DISABLE (1<<3)
|
2015-01-11 02:02:22 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN9_SLICE_COMMON_ECO_CHICKEN0 _MMIO(0x7308)
|
2015-02-09 19:33:11 +00:00
|
|
|
#define DISABLE_PIXEL_MASK_CAMMING (1<<14)
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN7_L3SQCREG1 _MMIO(0xB010)
|
2014-01-22 19:32:46 +00:00
|
|
|
#define VLV_B0_WA_L3SQCREG1_VALUE 0x00D30000
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN8_L3SQCREG1 _MMIO(0xB100)
|
2016-05-03 12:54:21 +00:00
|
|
|
/*
|
|
|
|
* Note that on CHV the following has an off-by-one error wrt. to BSpec.
|
|
|
|
* Using the formula in BSpec leads to a hang, while the formula here works
|
|
|
|
* fine and matches the formulas for all other platforms. A BSpec change
|
|
|
|
* request has been filed to clarify this.
|
|
|
|
*/
|
2016-05-03 12:54:20 +00:00
|
|
|
#define L3_GENERAL_PRIO_CREDITS(x) (((x) >> 1) << 19)
|
|
|
|
#define L3_HIGH_PRIO_CREDITS(x) (((x) >> 1) << 14)
|
2015-03-31 23:03:21 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN7_L3CNTLREG1 _MMIO(0xB01C)
|
2014-02-14 22:34:43 +00:00
|
|
|
#define GEN7_WA_FOR_GEN7_L3_CONTROL 0x3C47FF8C
|
2012-10-25 19:15:41 +00:00
|
|
|
#define GEN7_L3AGDIS (1<<19)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN7_L3CNTLREG2 _MMIO(0xB020)
|
|
|
|
#define GEN7_L3CNTLREG3 _MMIO(0xB024)
|
2012-02-08 20:53:50 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN7_L3_CHICKEN_MODE_REGISTER _MMIO(0xB030)
|
2012-02-08 20:53:50 +00:00
|
|
|
#define GEN7_WA_L3_CHICKEN_MODE 0x20000000
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN7_L3SQCREG4 _MMIO(0xb034)
|
2012-10-02 22:43:38 +00:00
|
|
|
#define L3SQ_URB_READ_CAM_MATCH_DISABLE (1<<27)
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN8_L3SQCREG4 _MMIO(0xb118)
|
2015-02-09 19:33:18 +00:00
|
|
|
#define GEN8_LQSC_RO_PERF_DIS (1<<27)
|
2015-06-19 17:37:13 +00:00
|
|
|
#define GEN8_LQSC_FLUSH_COHERENT_LINES (1<<21)
|
2015-02-09 19:33:18 +00:00
|
|
|
|
2013-12-13 01:26:03 +00:00
|
|
|
/* GEN8 chicken */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define HDC_CHICKEN0 _MMIO(0x7300)
|
2015-05-19 14:05:41 +00:00
|
|
|
#define HDC_FORCE_CSR_NON_COHERENT_OVR_DISABLE (1<<15)
|
2014-09-20 00:16:27 +00:00
|
|
|
#define HDC_FENCE_DEST_SLM_DISABLE (1<<14)
|
2015-02-10 10:31:00 +00:00
|
|
|
#define HDC_DONOT_FETCH_MEM_WHEN_MASKED (1<<11)
|
|
|
|
#define HDC_FORCE_CONTEXT_SAVE_RESTORE_NON_COHERENT (1<<5)
|
|
|
|
#define HDC_FORCE_NON_COHERENT (1<<4)
|
2015-02-09 19:33:22 +00:00
|
|
|
#define HDC_BARRIER_PERFORMANCE_DISABLE (1<<10)
|
2013-12-13 01:26:03 +00:00
|
|
|
|
2016-01-21 21:43:49 +00:00
|
|
|
#define GEN8_HDC_CHICKEN1 _MMIO(0x7304)
|
|
|
|
|
2015-03-11 08:54:53 +00:00
|
|
|
/* GEN9 chicken */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define SLICE_ECO_CHICKEN0 _MMIO(0x7308)
|
2015-03-11 08:54:53 +00:00
|
|
|
#define PIXEL_MASK_CAMMING_DISABLE (1 << 14)
|
|
|
|
|
2012-02-08 20:53:51 +00:00
|
|
|
/* WaCatErrorRejectionIssue */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN7_SQ_CHICKEN_MBCUNIT_CONFIG _MMIO(0x9030)
|
2012-02-08 20:53:51 +00:00
|
|
|
#define GEN7_SQ_CHICKEN_MBCUNIT_SQINTMOB (1<<11)
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define HSW_SCRATCH1 _MMIO(0xb038)
|
2013-10-02 22:53:16 +00:00
|
|
|
#define HSW_SCRATCH1_L3_DATA_ATOMICS_DISABLE (1<<27)
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define BDW_SCRATCH1 _MMIO(0xb11c)
|
2015-02-09 19:33:13 +00:00
|
|
|
#define GEN9_LBS_SLA_RETRY_TIMER_DECREMENT_ENABLE (1<<2)
|
|
|
|
|
2009-06-05 07:38:38 +00:00
|
|
|
/* PCH */
|
|
|
|
|
2012-06-06 19:45:44 +00:00
|
|
|
/* south display engine interrupt: IBX */
|
2011-01-04 23:09:39 +00:00
|
|
|
#define SDE_AUDIO_POWER_D (1 << 27)
|
|
|
|
#define SDE_AUDIO_POWER_C (1 << 26)
|
|
|
|
#define SDE_AUDIO_POWER_B (1 << 25)
|
|
|
|
#define SDE_AUDIO_POWER_SHIFT (25)
|
|
|
|
#define SDE_AUDIO_POWER_MASK (7 << SDE_AUDIO_POWER_SHIFT)
|
|
|
|
#define SDE_GMBUS (1 << 24)
|
|
|
|
#define SDE_AUDIO_HDCP_TRANSB (1 << 23)
|
|
|
|
#define SDE_AUDIO_HDCP_TRANSA (1 << 22)
|
|
|
|
#define SDE_AUDIO_HDCP_MASK (3 << 22)
|
|
|
|
#define SDE_AUDIO_TRANSB (1 << 21)
|
|
|
|
#define SDE_AUDIO_TRANSA (1 << 20)
|
|
|
|
#define SDE_AUDIO_TRANS_MASK (3 << 20)
|
|
|
|
#define SDE_POISON (1 << 19)
|
|
|
|
/* 18 reserved */
|
|
|
|
#define SDE_FDI_RXB (1 << 17)
|
|
|
|
#define SDE_FDI_RXA (1 << 16)
|
|
|
|
#define SDE_FDI_MASK (3 << 16)
|
|
|
|
#define SDE_AUXD (1 << 15)
|
|
|
|
#define SDE_AUXC (1 << 14)
|
|
|
|
#define SDE_AUXB (1 << 13)
|
|
|
|
#define SDE_AUX_MASK (7 << 13)
|
|
|
|
/* 12 reserved */
|
2009-06-05 07:38:38 +00:00
|
|
|
#define SDE_CRT_HOTPLUG (1 << 11)
|
|
|
|
#define SDE_PORTD_HOTPLUG (1 << 10)
|
|
|
|
#define SDE_PORTC_HOTPLUG (1 << 9)
|
|
|
|
#define SDE_PORTB_HOTPLUG (1 << 8)
|
|
|
|
#define SDE_SDVOB_HOTPLUG (1 << 6)
|
2013-02-28 09:17:12 +00:00
|
|
|
#define SDE_HOTPLUG_MASK (SDE_CRT_HOTPLUG | \
|
|
|
|
SDE_SDVOB_HOTPLUG | \
|
|
|
|
SDE_PORTB_HOTPLUG | \
|
|
|
|
SDE_PORTC_HOTPLUG | \
|
|
|
|
SDE_PORTD_HOTPLUG)
|
2011-01-04 23:09:39 +00:00
|
|
|
#define SDE_TRANSB_CRC_DONE (1 << 5)
|
|
|
|
#define SDE_TRANSB_CRC_ERR (1 << 4)
|
|
|
|
#define SDE_TRANSB_FIFO_UNDER (1 << 3)
|
|
|
|
#define SDE_TRANSA_CRC_DONE (1 << 2)
|
|
|
|
#define SDE_TRANSA_CRC_ERR (1 << 1)
|
|
|
|
#define SDE_TRANSA_FIFO_UNDER (1 << 0)
|
|
|
|
#define SDE_TRANS_MASK (0x3f)
|
2012-06-06 19:45:44 +00:00
|
|
|
|
|
|
|
/* south display engine interrupt: CPT/PPT */
|
|
|
|
#define SDE_AUDIO_POWER_D_CPT (1 << 31)
|
|
|
|
#define SDE_AUDIO_POWER_C_CPT (1 << 30)
|
|
|
|
#define SDE_AUDIO_POWER_B_CPT (1 << 29)
|
|
|
|
#define SDE_AUDIO_POWER_SHIFT_CPT 29
|
|
|
|
#define SDE_AUDIO_POWER_MASK_CPT (7 << 29)
|
|
|
|
#define SDE_AUXD_CPT (1 << 27)
|
|
|
|
#define SDE_AUXC_CPT (1 << 26)
|
|
|
|
#define SDE_AUXB_CPT (1 << 25)
|
|
|
|
#define SDE_AUX_MASK_CPT (7 << 25)
|
2015-08-17 07:55:50 +00:00
|
|
|
#define SDE_PORTE_HOTPLUG_SPT (1 << 25)
|
2015-08-27 20:56:07 +00:00
|
|
|
#define SDE_PORTA_HOTPLUG_SPT (1 << 24)
|
2010-04-07 08:15:54 +00:00
|
|
|
#define SDE_PORTD_HOTPLUG_CPT (1 << 23)
|
|
|
|
#define SDE_PORTC_HOTPLUG_CPT (1 << 22)
|
|
|
|
#define SDE_PORTB_HOTPLUG_CPT (1 << 21)
|
2012-06-06 19:45:44 +00:00
|
|
|
#define SDE_CRT_HOTPLUG_CPT (1 << 19)
|
2013-03-26 21:38:43 +00:00
|
|
|
#define SDE_SDVOB_HOTPLUG_CPT (1 << 18)
|
2010-10-08 09:21:06 +00:00
|
|
|
#define SDE_HOTPLUG_MASK_CPT (SDE_CRT_HOTPLUG_CPT | \
|
2013-03-26 21:38:43 +00:00
|
|
|
SDE_SDVOB_HOTPLUG_CPT | \
|
2010-10-08 09:21:06 +00:00
|
|
|
SDE_PORTD_HOTPLUG_CPT | \
|
|
|
|
SDE_PORTC_HOTPLUG_CPT | \
|
|
|
|
SDE_PORTB_HOTPLUG_CPT)
|
2015-08-17 07:55:50 +00:00
|
|
|
#define SDE_HOTPLUG_MASK_SPT (SDE_PORTE_HOTPLUG_SPT | \
|
|
|
|
SDE_PORTD_HOTPLUG_CPT | \
|
|
|
|
SDE_PORTC_HOTPLUG_CPT | \
|
2015-08-27 20:56:07 +00:00
|
|
|
SDE_PORTB_HOTPLUG_CPT | \
|
|
|
|
SDE_PORTA_HOTPLUG_SPT)
|
2012-06-06 19:45:44 +00:00
|
|
|
#define SDE_GMBUS_CPT (1 << 17)
|
drm/i915: report Gen5+ CPU and PCH FIFO underruns
In this commit we enable both CPU and PCH FIFO underrun reporting and
start reporting them. We follow a few rules:
- after we receive one of these errors, we mask the interrupt, so
we won't get an "interrupt storm" and we also won't flood dmesg;
- at each mode set we enable the interrupts again, so we'll see each
message at most once per mode set;
- in the specific places where we need to ignore the errors, we
completely mask the interrupts.
The downside of this patch is that since we're completely disabling
(masking) the interrupts instead of just not printing error messages,
we will mask more than just what we want on IVB/HSW CPU interrupts
(due to GEN7_ERR_INT) and on CPT/PPT/LPT PCHs (due to SERR_INT). So
when we decide to mask PCH FIFO underruns for pipe A on CPT, we'll
also be masking PCH FIFO underruns for pipe B, because both are
reported by SERR_INT, which has to be either completely enabled or
completely disabled (in othe words, there's no way to disable/enable
specific bits of GEN7_ERR_INT and SERR_INT).
V2: Rename some functions and variables, downgrade messages to
DRM_DEBUG_DRIVER and rebase.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2013-04-12 20:57:57 +00:00
|
|
|
#define SDE_ERROR_CPT (1 << 16)
|
2012-06-06 19:45:44 +00:00
|
|
|
#define SDE_AUDIO_CP_REQ_C_CPT (1 << 10)
|
|
|
|
#define SDE_AUDIO_CP_CHG_C_CPT (1 << 9)
|
|
|
|
#define SDE_FDI_RXC_CPT (1 << 8)
|
|
|
|
#define SDE_AUDIO_CP_REQ_B_CPT (1 << 6)
|
|
|
|
#define SDE_AUDIO_CP_CHG_B_CPT (1 << 5)
|
|
|
|
#define SDE_FDI_RXB_CPT (1 << 4)
|
|
|
|
#define SDE_AUDIO_CP_REQ_A_CPT (1 << 2)
|
|
|
|
#define SDE_AUDIO_CP_CHG_A_CPT (1 << 1)
|
|
|
|
#define SDE_FDI_RXA_CPT (1 << 0)
|
|
|
|
#define SDE_AUDIO_CP_REQ_CPT (SDE_AUDIO_CP_REQ_C_CPT | \
|
|
|
|
SDE_AUDIO_CP_REQ_B_CPT | \
|
|
|
|
SDE_AUDIO_CP_REQ_A_CPT)
|
|
|
|
#define SDE_AUDIO_CP_CHG_CPT (SDE_AUDIO_CP_CHG_C_CPT | \
|
|
|
|
SDE_AUDIO_CP_CHG_B_CPT | \
|
|
|
|
SDE_AUDIO_CP_CHG_A_CPT)
|
|
|
|
#define SDE_FDI_MASK_CPT (SDE_FDI_RXC_CPT | \
|
|
|
|
SDE_FDI_RXB_CPT | \
|
|
|
|
SDE_FDI_RXA_CPT)
|
2009-06-05 07:38:38 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define SDEISR _MMIO(0xc4000)
|
|
|
|
#define SDEIMR _MMIO(0xc4004)
|
|
|
|
#define SDEIIR _MMIO(0xc4008)
|
|
|
|
#define SDEIER _MMIO(0xc400c)
|
2009-06-05 07:38:38 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define SERR_INT _MMIO(0xc4040)
|
2013-04-12 20:57:58 +00:00
|
|
|
#define SERR_INT_POISON (1<<31)
|
drm/i915: report Gen5+ CPU and PCH FIFO underruns
In this commit we enable both CPU and PCH FIFO underrun reporting and
start reporting them. We follow a few rules:
- after we receive one of these errors, we mask the interrupt, so
we won't get an "interrupt storm" and we also won't flood dmesg;
- at each mode set we enable the interrupts again, so we'll see each
message at most once per mode set;
- in the specific places where we need to ignore the errors, we
completely mask the interrupts.
The downside of this patch is that since we're completely disabling
(masking) the interrupts instead of just not printing error messages,
we will mask more than just what we want on IVB/HSW CPU interrupts
(due to GEN7_ERR_INT) and on CPT/PPT/LPT PCHs (due to SERR_INT). So
when we decide to mask PCH FIFO underruns for pipe A on CPT, we'll
also be masking PCH FIFO underruns for pipe B, because both are
reported by SERR_INT, which has to be either completely enabled or
completely disabled (in othe words, there's no way to disable/enable
specific bits of GEN7_ERR_INT and SERR_INT).
V2: Rename some functions and variables, downgrade messages to
DRM_DEBUG_DRIVER and rebase.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2013-04-12 20:57:57 +00:00
|
|
|
#define SERR_INT_TRANS_C_FIFO_UNDERRUN (1<<6)
|
|
|
|
#define SERR_INT_TRANS_B_FIFO_UNDERRUN (1<<3)
|
|
|
|
#define SERR_INT_TRANS_A_FIFO_UNDERRUN (1<<0)
|
2015-09-18 17:03:39 +00:00
|
|
|
#define SERR_INT_TRANS_FIFO_UNDERRUN(pipe) (1<<((pipe)*3))
|
drm/i915: report Gen5+ CPU and PCH FIFO underruns
In this commit we enable both CPU and PCH FIFO underrun reporting and
start reporting them. We follow a few rules:
- after we receive one of these errors, we mask the interrupt, so
we won't get an "interrupt storm" and we also won't flood dmesg;
- at each mode set we enable the interrupts again, so we'll see each
message at most once per mode set;
- in the specific places where we need to ignore the errors, we
completely mask the interrupts.
The downside of this patch is that since we're completely disabling
(masking) the interrupts instead of just not printing error messages,
we will mask more than just what we want on IVB/HSW CPU interrupts
(due to GEN7_ERR_INT) and on CPT/PPT/LPT PCHs (due to SERR_INT). So
when we decide to mask PCH FIFO underruns for pipe A on CPT, we'll
also be masking PCH FIFO underruns for pipe B, because both are
reported by SERR_INT, which has to be either completely enabled or
completely disabled (in othe words, there's no way to disable/enable
specific bits of GEN7_ERR_INT and SERR_INT).
V2: Rename some functions and variables, downgrade messages to
DRM_DEBUG_DRIVER and rebase.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2013-04-12 20:57:57 +00:00
|
|
|
|
2009-06-05 07:38:38 +00:00
|
|
|
/* digital port hotplug */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define PCH_PORT_HOTPLUG _MMIO(0xc4030) /* SHOTPLUG_CTL */
|
2015-08-27 20:56:00 +00:00
|
|
|
#define PORTA_HOTPLUG_ENABLE (1 << 28) /* LPT:LP+ & BXT */
|
2016-03-31 10:41:47 +00:00
|
|
|
#define BXT_DDIA_HPD_INVERT (1 << 27)
|
2015-08-27 20:56:00 +00:00
|
|
|
#define PORTA_HOTPLUG_STATUS_MASK (3 << 24) /* SPT+ & BXT */
|
|
|
|
#define PORTA_HOTPLUG_NO_DETECT (0 << 24) /* SPT+ & BXT */
|
|
|
|
#define PORTA_HOTPLUG_SHORT_DETECT (1 << 24) /* SPT+ & BXT */
|
|
|
|
#define PORTA_HOTPLUG_LONG_DETECT (2 << 24) /* SPT+ & BXT */
|
2015-08-27 20:55:56 +00:00
|
|
|
#define PORTD_HOTPLUG_ENABLE (1 << 20)
|
|
|
|
#define PORTD_PULSE_DURATION_2ms (0 << 18) /* pre-LPT */
|
|
|
|
#define PORTD_PULSE_DURATION_4_5ms (1 << 18) /* pre-LPT */
|
|
|
|
#define PORTD_PULSE_DURATION_6ms (2 << 18) /* pre-LPT */
|
|
|
|
#define PORTD_PULSE_DURATION_100ms (3 << 18) /* pre-LPT */
|
|
|
|
#define PORTD_PULSE_DURATION_MASK (3 << 18) /* pre-LPT */
|
|
|
|
#define PORTD_HOTPLUG_STATUS_MASK (3 << 16)
|
2012-12-13 16:08:59 +00:00
|
|
|
#define PORTD_HOTPLUG_NO_DETECT (0 << 16)
|
|
|
|
#define PORTD_HOTPLUG_SHORT_DETECT (1 << 16)
|
|
|
|
#define PORTD_HOTPLUG_LONG_DETECT (2 << 16)
|
2015-08-27 20:55:56 +00:00
|
|
|
#define PORTC_HOTPLUG_ENABLE (1 << 12)
|
2016-03-31 10:41:47 +00:00
|
|
|
#define BXT_DDIC_HPD_INVERT (1 << 11)
|
2015-08-27 20:55:56 +00:00
|
|
|
#define PORTC_PULSE_DURATION_2ms (0 << 10) /* pre-LPT */
|
|
|
|
#define PORTC_PULSE_DURATION_4_5ms (1 << 10) /* pre-LPT */
|
|
|
|
#define PORTC_PULSE_DURATION_6ms (2 << 10) /* pre-LPT */
|
|
|
|
#define PORTC_PULSE_DURATION_100ms (3 << 10) /* pre-LPT */
|
|
|
|
#define PORTC_PULSE_DURATION_MASK (3 << 10) /* pre-LPT */
|
|
|
|
#define PORTC_HOTPLUG_STATUS_MASK (3 << 8)
|
2012-12-13 16:08:59 +00:00
|
|
|
#define PORTC_HOTPLUG_NO_DETECT (0 << 8)
|
|
|
|
#define PORTC_HOTPLUG_SHORT_DETECT (1 << 8)
|
|
|
|
#define PORTC_HOTPLUG_LONG_DETECT (2 << 8)
|
2015-08-27 20:55:56 +00:00
|
|
|
#define PORTB_HOTPLUG_ENABLE (1 << 4)
|
2016-03-31 10:41:47 +00:00
|
|
|
#define BXT_DDIB_HPD_INVERT (1 << 3)
|
2015-08-27 20:55:56 +00:00
|
|
|
#define PORTB_PULSE_DURATION_2ms (0 << 2) /* pre-LPT */
|
|
|
|
#define PORTB_PULSE_DURATION_4_5ms (1 << 2) /* pre-LPT */
|
|
|
|
#define PORTB_PULSE_DURATION_6ms (2 << 2) /* pre-LPT */
|
|
|
|
#define PORTB_PULSE_DURATION_100ms (3 << 2) /* pre-LPT */
|
|
|
|
#define PORTB_PULSE_DURATION_MASK (3 << 2) /* pre-LPT */
|
|
|
|
#define PORTB_HOTPLUG_STATUS_MASK (3 << 0)
|
2012-12-13 16:08:59 +00:00
|
|
|
#define PORTB_HOTPLUG_NO_DETECT (0 << 0)
|
|
|
|
#define PORTB_HOTPLUG_SHORT_DETECT (1 << 0)
|
|
|
|
#define PORTB_HOTPLUG_LONG_DETECT (2 << 0)
|
2016-03-31 10:41:47 +00:00
|
|
|
#define BXT_DDI_HPD_INVERT_MASK (BXT_DDIA_HPD_INVERT | \
|
|
|
|
BXT_DDIB_HPD_INVERT | \
|
|
|
|
BXT_DDIC_HPD_INVERT)
|
2009-06-05 07:38:38 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define PCH_PORT_HOTPLUG2 _MMIO(0xc403C) /* SHOTPLUG_CTL2 SPT+ */
|
2015-08-27 20:55:56 +00:00
|
|
|
#define PORTE_HOTPLUG_ENABLE (1 << 4)
|
|
|
|
#define PORTE_HOTPLUG_STATUS_MASK (3 << 0)
|
2015-08-17 07:55:50 +00:00
|
|
|
#define PORTE_HOTPLUG_NO_DETECT (0 << 0)
|
|
|
|
#define PORTE_HOTPLUG_SHORT_DETECT (1 << 0)
|
|
|
|
#define PORTE_HOTPLUG_LONG_DETECT (2 << 0)
|
2009-06-05 07:38:38 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define PCH_GPIOA _MMIO(0xc5010)
|
|
|
|
#define PCH_GPIOB _MMIO(0xc5014)
|
|
|
|
#define PCH_GPIOC _MMIO(0xc5018)
|
|
|
|
#define PCH_GPIOD _MMIO(0xc501c)
|
|
|
|
#define PCH_GPIOE _MMIO(0xc5020)
|
|
|
|
#define PCH_GPIOF _MMIO(0xc5024)
|
2009-06-05 07:38:38 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define PCH_GMBUS0 _MMIO(0xc5100)
|
|
|
|
#define PCH_GMBUS1 _MMIO(0xc5104)
|
|
|
|
#define PCH_GMBUS2 _MMIO(0xc5108)
|
|
|
|
#define PCH_GMBUS3 _MMIO(0xc510c)
|
|
|
|
#define PCH_GMBUS4 _MMIO(0xc5110)
|
|
|
|
#define PCH_GMBUS5 _MMIO(0xc5120)
|
2009-12-01 19:56:30 +00:00
|
|
|
|
2011-02-07 20:26:52 +00:00
|
|
|
#define _PCH_DPLL_A 0xc6014
|
|
|
|
#define _PCH_DPLL_B 0xc6018
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define PCH_DPLL(pll) _MMIO(pll == 0 ? _PCH_DPLL_A : _PCH_DPLL_B)
|
2009-06-05 07:38:38 +00:00
|
|
|
|
2011-02-07 20:26:52 +00:00
|
|
|
#define _PCH_FPA0 0xc6040
|
2010-12-03 21:35:48 +00:00
|
|
|
#define FP_CB_TUNE (0x3<<22)
|
2011-02-07 20:26:52 +00:00
|
|
|
#define _PCH_FPA1 0xc6044
|
|
|
|
#define _PCH_FPB0 0xc6048
|
|
|
|
#define _PCH_FPB1 0xc604c
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define PCH_FP0(pll) _MMIO(pll == 0 ? _PCH_FPA0 : _PCH_FPB0)
|
|
|
|
#define PCH_FP1(pll) _MMIO(pll == 0 ? _PCH_FPA1 : _PCH_FPB1)
|
2009-06-05 07:38:38 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define PCH_DPLL_TEST _MMIO(0xc606c)
|
2009-06-05 07:38:38 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define PCH_DREF_CONTROL _MMIO(0xC6200)
|
2009-06-05 07:38:38 +00:00
|
|
|
#define DREF_CONTROL_MASK 0x7fc3
|
|
|
|
#define DREF_CPU_SOURCE_OUTPUT_DISABLE (0<<13)
|
|
|
|
#define DREF_CPU_SOURCE_OUTPUT_DOWNSPREAD (2<<13)
|
|
|
|
#define DREF_CPU_SOURCE_OUTPUT_NONSPREAD (3<<13)
|
|
|
|
#define DREF_CPU_SOURCE_OUTPUT_MASK (3<<13)
|
|
|
|
#define DREF_SSC_SOURCE_DISABLE (0<<11)
|
|
|
|
#define DREF_SSC_SOURCE_ENABLE (2<<11)
|
2009-10-19 07:43:48 +00:00
|
|
|
#define DREF_SSC_SOURCE_MASK (3<<11)
|
2009-06-05 07:38:38 +00:00
|
|
|
#define DREF_NONSPREAD_SOURCE_DISABLE (0<<9)
|
|
|
|
#define DREF_NONSPREAD_CK505_ENABLE (1<<9)
|
|
|
|
#define DREF_NONSPREAD_SOURCE_ENABLE (2<<9)
|
2009-10-19 07:43:48 +00:00
|
|
|
#define DREF_NONSPREAD_SOURCE_MASK (3<<9)
|
2009-06-05 07:38:38 +00:00
|
|
|
#define DREF_SUPERSPREAD_SOURCE_DISABLE (0<<7)
|
|
|
|
#define DREF_SUPERSPREAD_SOURCE_ENABLE (2<<7)
|
2011-01-04 23:09:34 +00:00
|
|
|
#define DREF_SUPERSPREAD_SOURCE_MASK (3<<7)
|
2009-06-05 07:38:38 +00:00
|
|
|
#define DREF_SSC4_DOWNSPREAD (0<<6)
|
|
|
|
#define DREF_SSC4_CENTERSPREAD (1<<6)
|
|
|
|
#define DREF_SSC1_DISABLE (0<<1)
|
|
|
|
#define DREF_SSC1_ENABLE (1<<1)
|
|
|
|
#define DREF_SSC4_DISABLE (0)
|
|
|
|
#define DREF_SSC4_ENABLE (1)
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define PCH_RAWCLK_FREQ _MMIO(0xc6204)
|
2009-06-05 07:38:38 +00:00
|
|
|
#define FDL_TP1_TIMER_SHIFT 12
|
|
|
|
#define FDL_TP1_TIMER_MASK (3<<12)
|
|
|
|
#define FDL_TP2_TIMER_SHIFT 10
|
|
|
|
#define FDL_TP2_TIMER_MASK (3<<10)
|
|
|
|
#define RAWCLK_FREQ_MASK 0x3ff
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define PCH_DPLL_TMR_CFG _MMIO(0xc6208)
|
2009-06-05 07:38:38 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define PCH_SSC4_PARMS _MMIO(0xc6210)
|
|
|
|
#define PCH_SSC4_AUX_PARMS _MMIO(0xc6214)
|
2009-06-05 07:38:38 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define PCH_DPLL_SEL _MMIO(0xc7000)
|
2015-09-18 17:03:39 +00:00
|
|
|
#define TRANS_DPLLB_SEL(pipe) (1 << ((pipe) * 4))
|
2013-06-05 11:34:09 +00:00
|
|
|
#define TRANS_DPLLA_SEL(pipe) 0
|
2015-09-18 17:03:39 +00:00
|
|
|
#define TRANS_DPLL_ENABLE(pipe) (1 << ((pipe) * 4 + 3))
|
2010-04-07 08:15:54 +00:00
|
|
|
|
2009-06-05 07:38:38 +00:00
|
|
|
/* transcoder */
|
|
|
|
|
2013-05-03 09:49:47 +00:00
|
|
|
#define _PCH_TRANS_HTOTAL_A 0xe0000
|
|
|
|
#define TRANS_HTOTAL_SHIFT 16
|
|
|
|
#define TRANS_HACTIVE_SHIFT 0
|
|
|
|
#define _PCH_TRANS_HBLANK_A 0xe0004
|
|
|
|
#define TRANS_HBLANK_END_SHIFT 16
|
|
|
|
#define TRANS_HBLANK_START_SHIFT 0
|
|
|
|
#define _PCH_TRANS_HSYNC_A 0xe0008
|
|
|
|
#define TRANS_HSYNC_END_SHIFT 16
|
|
|
|
#define TRANS_HSYNC_START_SHIFT 0
|
|
|
|
#define _PCH_TRANS_VTOTAL_A 0xe000c
|
|
|
|
#define TRANS_VTOTAL_SHIFT 16
|
|
|
|
#define TRANS_VACTIVE_SHIFT 0
|
|
|
|
#define _PCH_TRANS_VBLANK_A 0xe0010
|
|
|
|
#define TRANS_VBLANK_END_SHIFT 16
|
|
|
|
#define TRANS_VBLANK_START_SHIFT 0
|
|
|
|
#define _PCH_TRANS_VSYNC_A 0xe0014
|
|
|
|
#define TRANS_VSYNC_END_SHIFT 16
|
|
|
|
#define TRANS_VSYNC_START_SHIFT 0
|
|
|
|
#define _PCH_TRANS_VSYNCSHIFT_A 0xe0028
|
2009-06-05 07:38:38 +00:00
|
|
|
|
2013-05-03 09:49:49 +00:00
|
|
|
#define _PCH_TRANSA_DATA_M1 0xe0030
|
|
|
|
#define _PCH_TRANSA_DATA_N1 0xe0034
|
|
|
|
#define _PCH_TRANSA_DATA_M2 0xe0038
|
|
|
|
#define _PCH_TRANSA_DATA_N2 0xe003c
|
|
|
|
#define _PCH_TRANSA_LINK_M1 0xe0040
|
|
|
|
#define _PCH_TRANSA_LINK_N1 0xe0044
|
|
|
|
#define _PCH_TRANSA_LINK_M2 0xe0048
|
|
|
|
#define _PCH_TRANSA_LINK_N2 0xe004c
|
2011-02-07 20:26:52 +00:00
|
|
|
|
2014-04-09 10:29:09 +00:00
|
|
|
/* Per-transcoder DIP controls (PCH) */
|
2011-07-08 18:31:57 +00:00
|
|
|
#define _VIDEO_DIP_CTL_A 0xe0200
|
|
|
|
#define _VIDEO_DIP_DATA_A 0xe0208
|
|
|
|
#define _VIDEO_DIP_GCP_A 0xe0210
|
2015-05-05 14:06:20 +00:00
|
|
|
#define GCP_COLOR_INDICATION (1 << 2)
|
|
|
|
#define GCP_DEFAULT_PHASE_ENABLE (1 << 1)
|
|
|
|
#define GCP_AV_MUTE (1 << 0)
|
2011-07-08 18:31:57 +00:00
|
|
|
|
|
|
|
#define _VIDEO_DIP_CTL_B 0xe1200
|
|
|
|
#define _VIDEO_DIP_DATA_B 0xe1208
|
|
|
|
#define _VIDEO_DIP_GCP_B 0xe1210
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define TVIDEO_DIP_CTL(pipe) _MMIO_PIPE(pipe, _VIDEO_DIP_CTL_A, _VIDEO_DIP_CTL_B)
|
|
|
|
#define TVIDEO_DIP_DATA(pipe) _MMIO_PIPE(pipe, _VIDEO_DIP_DATA_A, _VIDEO_DIP_DATA_B)
|
|
|
|
#define TVIDEO_DIP_GCP(pipe) _MMIO_PIPE(pipe, _VIDEO_DIP_GCP_A, _VIDEO_DIP_GCP_B)
|
2011-07-08 18:31:57 +00:00
|
|
|
|
2014-04-09 10:29:09 +00:00
|
|
|
/* Per-transcoder DIP controls (VLV) */
|
2015-11-04 21:20:01 +00:00
|
|
|
#define _VLV_VIDEO_DIP_CTL_A (VLV_DISPLAY_BASE + 0x60200)
|
|
|
|
#define _VLV_VIDEO_DIP_DATA_A (VLV_DISPLAY_BASE + 0x60208)
|
|
|
|
#define _VLV_VIDEO_DIP_GDCP_PAYLOAD_A (VLV_DISPLAY_BASE + 0x60210)
|
2012-03-28 20:39:32 +00:00
|
|
|
|
2015-11-04 21:20:01 +00:00
|
|
|
#define _VLV_VIDEO_DIP_CTL_B (VLV_DISPLAY_BASE + 0x61170)
|
|
|
|
#define _VLV_VIDEO_DIP_DATA_B (VLV_DISPLAY_BASE + 0x61174)
|
|
|
|
#define _VLV_VIDEO_DIP_GDCP_PAYLOAD_B (VLV_DISPLAY_BASE + 0x61178)
|
2012-03-28 20:39:32 +00:00
|
|
|
|
2015-11-04 21:20:01 +00:00
|
|
|
#define _CHV_VIDEO_DIP_CTL_C (VLV_DISPLAY_BASE + 0x611f0)
|
|
|
|
#define _CHV_VIDEO_DIP_DATA_C (VLV_DISPLAY_BASE + 0x611f4)
|
|
|
|
#define _CHV_VIDEO_DIP_GDCP_PAYLOAD_C (VLV_DISPLAY_BASE + 0x611f8)
|
2014-04-09 10:29:09 +00:00
|
|
|
|
2012-03-28 20:39:32 +00:00
|
|
|
#define VLV_TVIDEO_DIP_CTL(pipe) \
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
_MMIO_PIPE3((pipe), _VLV_VIDEO_DIP_CTL_A, \
|
2015-11-04 21:20:01 +00:00
|
|
|
_VLV_VIDEO_DIP_CTL_B, _CHV_VIDEO_DIP_CTL_C)
|
2012-03-28 20:39:32 +00:00
|
|
|
#define VLV_TVIDEO_DIP_DATA(pipe) \
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
_MMIO_PIPE3((pipe), _VLV_VIDEO_DIP_DATA_A, \
|
2015-11-04 21:20:01 +00:00
|
|
|
_VLV_VIDEO_DIP_DATA_B, _CHV_VIDEO_DIP_DATA_C)
|
2012-03-28 20:39:32 +00:00
|
|
|
#define VLV_TVIDEO_DIP_GCP(pipe) \
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
_MMIO_PIPE3((pipe), _VLV_VIDEO_DIP_GDCP_PAYLOAD_A, \
|
2015-11-04 21:20:01 +00:00
|
|
|
_VLV_VIDEO_DIP_GDCP_PAYLOAD_B, _CHV_VIDEO_DIP_GDCP_PAYLOAD_C)
|
2012-03-28 20:39:32 +00:00
|
|
|
|
2012-05-10 13:18:02 +00:00
|
|
|
/* Haswell DIP controls */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
|
2015-11-04 21:20:01 +00:00
|
|
|
#define _HSW_VIDEO_DIP_CTL_A 0x60200
|
|
|
|
#define _HSW_VIDEO_DIP_AVI_DATA_A 0x60220
|
|
|
|
#define _HSW_VIDEO_DIP_VS_DATA_A 0x60260
|
|
|
|
#define _HSW_VIDEO_DIP_SPD_DATA_A 0x602A0
|
|
|
|
#define _HSW_VIDEO_DIP_GMP_DATA_A 0x602E0
|
|
|
|
#define _HSW_VIDEO_DIP_VSC_DATA_A 0x60320
|
|
|
|
#define _HSW_VIDEO_DIP_AVI_ECC_A 0x60240
|
|
|
|
#define _HSW_VIDEO_DIP_VS_ECC_A 0x60280
|
|
|
|
#define _HSW_VIDEO_DIP_SPD_ECC_A 0x602C0
|
|
|
|
#define _HSW_VIDEO_DIP_GMP_ECC_A 0x60300
|
|
|
|
#define _HSW_VIDEO_DIP_VSC_ECC_A 0x60344
|
|
|
|
#define _HSW_VIDEO_DIP_GCP_A 0x60210
|
|
|
|
|
|
|
|
#define _HSW_VIDEO_DIP_CTL_B 0x61200
|
|
|
|
#define _HSW_VIDEO_DIP_AVI_DATA_B 0x61220
|
|
|
|
#define _HSW_VIDEO_DIP_VS_DATA_B 0x61260
|
|
|
|
#define _HSW_VIDEO_DIP_SPD_DATA_B 0x612A0
|
|
|
|
#define _HSW_VIDEO_DIP_GMP_DATA_B 0x612E0
|
|
|
|
#define _HSW_VIDEO_DIP_VSC_DATA_B 0x61320
|
|
|
|
#define _HSW_VIDEO_DIP_BVI_ECC_B 0x61240
|
|
|
|
#define _HSW_VIDEO_DIP_VS_ECC_B 0x61280
|
|
|
|
#define _HSW_VIDEO_DIP_SPD_ECC_B 0x612C0
|
|
|
|
#define _HSW_VIDEO_DIP_GMP_ECC_B 0x61300
|
|
|
|
#define _HSW_VIDEO_DIP_VSC_ECC_B 0x61344
|
|
|
|
#define _HSW_VIDEO_DIP_GCP_B 0x61210
|
2012-05-10 13:18:02 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define HSW_TVIDEO_DIP_CTL(trans) _MMIO_TRANS2(trans, _HSW_VIDEO_DIP_CTL_A)
|
|
|
|
#define HSW_TVIDEO_DIP_AVI_DATA(trans, i) _MMIO_TRANS2(trans, _HSW_VIDEO_DIP_AVI_DATA_A + (i) * 4)
|
|
|
|
#define HSW_TVIDEO_DIP_VS_DATA(trans, i) _MMIO_TRANS2(trans, _HSW_VIDEO_DIP_VS_DATA_A + (i) * 4)
|
|
|
|
#define HSW_TVIDEO_DIP_SPD_DATA(trans, i) _MMIO_TRANS2(trans, _HSW_VIDEO_DIP_SPD_DATA_A + (i) * 4)
|
|
|
|
#define HSW_TVIDEO_DIP_GCP(trans) _MMIO_TRANS2(trans, _HSW_VIDEO_DIP_GCP_A)
|
|
|
|
#define HSW_TVIDEO_DIP_VSC_DATA(trans, i) _MMIO_TRANS2(trans, _HSW_VIDEO_DIP_VSC_DATA_A + (i) * 4)
|
|
|
|
|
|
|
|
#define _HSW_STEREO_3D_CTL_A 0x70020
|
|
|
|
#define S3D_ENABLE (1<<31)
|
|
|
|
#define _HSW_STEREO_3D_CTL_B 0x71020
|
|
|
|
|
|
|
|
#define HSW_STEREO_3D_CTL(trans) _MMIO_PIPE2(trans, _HSW_STEREO_3D_CTL_A)
|
2013-07-11 21:45:00 +00:00
|
|
|
|
2013-05-03 09:49:47 +00:00
|
|
|
#define _PCH_TRANS_HTOTAL_B 0xe1000
|
|
|
|
#define _PCH_TRANS_HBLANK_B 0xe1004
|
|
|
|
#define _PCH_TRANS_HSYNC_B 0xe1008
|
|
|
|
#define _PCH_TRANS_VTOTAL_B 0xe100c
|
|
|
|
#define _PCH_TRANS_VBLANK_B 0xe1010
|
|
|
|
#define _PCH_TRANS_VSYNC_B 0xe1014
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define _PCH_TRANS_VSYNCSHIFT_B 0xe1028
|
2013-05-03 09:49:47 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define PCH_TRANS_HTOTAL(pipe) _MMIO_PIPE(pipe, _PCH_TRANS_HTOTAL_A, _PCH_TRANS_HTOTAL_B)
|
|
|
|
#define PCH_TRANS_HBLANK(pipe) _MMIO_PIPE(pipe, _PCH_TRANS_HBLANK_A, _PCH_TRANS_HBLANK_B)
|
|
|
|
#define PCH_TRANS_HSYNC(pipe) _MMIO_PIPE(pipe, _PCH_TRANS_HSYNC_A, _PCH_TRANS_HSYNC_B)
|
|
|
|
#define PCH_TRANS_VTOTAL(pipe) _MMIO_PIPE(pipe, _PCH_TRANS_VTOTAL_A, _PCH_TRANS_VTOTAL_B)
|
|
|
|
#define PCH_TRANS_VBLANK(pipe) _MMIO_PIPE(pipe, _PCH_TRANS_VBLANK_A, _PCH_TRANS_VBLANK_B)
|
|
|
|
#define PCH_TRANS_VSYNC(pipe) _MMIO_PIPE(pipe, _PCH_TRANS_VSYNC_A, _PCH_TRANS_VSYNC_B)
|
|
|
|
#define PCH_TRANS_VSYNCSHIFT(pipe) _MMIO_PIPE(pipe, _PCH_TRANS_VSYNCSHIFT_A, _PCH_TRANS_VSYNCSHIFT_B)
|
2011-02-07 20:26:52 +00:00
|
|
|
|
2013-05-03 09:49:49 +00:00
|
|
|
#define _PCH_TRANSB_DATA_M1 0xe1030
|
|
|
|
#define _PCH_TRANSB_DATA_N1 0xe1034
|
|
|
|
#define _PCH_TRANSB_DATA_M2 0xe1038
|
|
|
|
#define _PCH_TRANSB_DATA_N2 0xe103c
|
|
|
|
#define _PCH_TRANSB_LINK_M1 0xe1040
|
|
|
|
#define _PCH_TRANSB_LINK_N1 0xe1044
|
|
|
|
#define _PCH_TRANSB_LINK_M2 0xe1048
|
|
|
|
#define _PCH_TRANSB_LINK_N2 0xe104c
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define PCH_TRANS_DATA_M1(pipe) _MMIO_PIPE(pipe, _PCH_TRANSA_DATA_M1, _PCH_TRANSB_DATA_M1)
|
|
|
|
#define PCH_TRANS_DATA_N1(pipe) _MMIO_PIPE(pipe, _PCH_TRANSA_DATA_N1, _PCH_TRANSB_DATA_N1)
|
|
|
|
#define PCH_TRANS_DATA_M2(pipe) _MMIO_PIPE(pipe, _PCH_TRANSA_DATA_M2, _PCH_TRANSB_DATA_M2)
|
|
|
|
#define PCH_TRANS_DATA_N2(pipe) _MMIO_PIPE(pipe, _PCH_TRANSA_DATA_N2, _PCH_TRANSB_DATA_N2)
|
|
|
|
#define PCH_TRANS_LINK_M1(pipe) _MMIO_PIPE(pipe, _PCH_TRANSA_LINK_M1, _PCH_TRANSB_LINK_M1)
|
|
|
|
#define PCH_TRANS_LINK_N1(pipe) _MMIO_PIPE(pipe, _PCH_TRANSA_LINK_N1, _PCH_TRANSB_LINK_N1)
|
|
|
|
#define PCH_TRANS_LINK_M2(pipe) _MMIO_PIPE(pipe, _PCH_TRANSA_LINK_M2, _PCH_TRANSB_LINK_M2)
|
|
|
|
#define PCH_TRANS_LINK_N2(pipe) _MMIO_PIPE(pipe, _PCH_TRANSA_LINK_N2, _PCH_TRANSB_LINK_N2)
|
2011-02-07 20:26:52 +00:00
|
|
|
|
2013-05-03 09:49:46 +00:00
|
|
|
#define _PCH_TRANSACONF 0xf0008
|
|
|
|
#define _PCH_TRANSBCONF 0xf1008
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define PCH_TRANSCONF(pipe) _MMIO_PIPE(pipe, _PCH_TRANSACONF, _PCH_TRANSBCONF)
|
|
|
|
#define LPT_TRANSCONF PCH_TRANSCONF(PIPE_A) /* lpt has only one transcoder */
|
2009-06-05 07:38:38 +00:00
|
|
|
#define TRANS_DISABLE (0<<31)
|
|
|
|
#define TRANS_ENABLE (1<<31)
|
|
|
|
#define TRANS_STATE_MASK (1<<30)
|
|
|
|
#define TRANS_STATE_DISABLE (0<<30)
|
|
|
|
#define TRANS_STATE_ENABLE (1<<30)
|
|
|
|
#define TRANS_FSYNC_DELAY_HB1 (0<<27)
|
|
|
|
#define TRANS_FSYNC_DELAY_HB2 (1<<27)
|
|
|
|
#define TRANS_FSYNC_DELAY_HB3 (2<<27)
|
|
|
|
#define TRANS_FSYNC_DELAY_HB4 (3<<27)
|
2012-02-03 19:47:15 +00:00
|
|
|
#define TRANS_INTERLACE_MASK (7<<21)
|
2009-06-05 07:38:38 +00:00
|
|
|
#define TRANS_PROGRESSIVE (0<<21)
|
2012-02-03 19:47:15 +00:00
|
|
|
#define TRANS_INTERLACED (3<<21)
|
2012-02-14 19:07:09 +00:00
|
|
|
#define TRANS_LEGACY_INTERLACED_ILK (2<<21)
|
2009-06-05 07:38:38 +00:00
|
|
|
#define TRANS_8BPC (0<<5)
|
|
|
|
#define TRANS_10BPC (1<<5)
|
|
|
|
#define TRANS_6BPC (2<<5)
|
|
|
|
#define TRANS_12BPC (3<<5)
|
|
|
|
|
2012-10-31 21:52:30 +00:00
|
|
|
#define _TRANSA_CHICKEN1 0xf0060
|
|
|
|
#define _TRANSB_CHICKEN1 0xf1060
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define TRANS_CHICKEN1(pipe) _MMIO_PIPE(pipe, _TRANSA_CHICKEN1, _TRANSB_CHICKEN1)
|
2015-05-05 14:06:19 +00:00
|
|
|
#define TRANS_CHICKEN1_HDMIUNIT_GC_DISABLE (1<<10)
|
2012-10-31 21:52:30 +00:00
|
|
|
#define TRANS_CHICKEN1_DP0UNIT_GC_DISABLE (1<<4)
|
2011-07-27 18:51:40 +00:00
|
|
|
#define _TRANSA_CHICKEN2 0xf0064
|
|
|
|
#define _TRANSB_CHICKEN2 0xf1064
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define TRANS_CHICKEN2(pipe) _MMIO_PIPE(pipe, _TRANSA_CHICKEN2, _TRANSB_CHICKEN2)
|
2013-04-08 18:48:08 +00:00
|
|
|
#define TRANS_CHICKEN2_TIMING_OVERRIDE (1<<31)
|
|
|
|
#define TRANS_CHICKEN2_FDI_POLARITY_REVERSED (1<<29)
|
|
|
|
#define TRANS_CHICKEN2_FRAME_START_DELAY_MASK (3<<27)
|
|
|
|
#define TRANS_CHICKEN2_DISABLE_DEEP_COLOR_COUNTER (1<<26)
|
|
|
|
#define TRANS_CHICKEN2_DISABLE_DEEP_COLOR_MODESWITCH (1<<25)
|
2011-07-27 18:51:40 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define SOUTH_CHICKEN1 _MMIO(0xc2000)
|
2011-07-29 19:42:37 +00:00
|
|
|
#define FDIA_PHASE_SYNC_SHIFT_OVR 19
|
|
|
|
#define FDIA_PHASE_SYNC_SHIFT_EN 18
|
2012-10-27 13:58:40 +00:00
|
|
|
#define FDI_PHASE_SYNC_OVR(pipe) (1<<(FDIA_PHASE_SYNC_SHIFT_OVR - ((pipe) * 2)))
|
|
|
|
#define FDI_PHASE_SYNC_EN(pipe) (1<<(FDIA_PHASE_SYNC_SHIFT_EN - ((pipe) * 2)))
|
|
|
|
#define FDI_BC_BIFURCATION_SELECT (1 << 12)
|
2015-09-04 13:55:14 +00:00
|
|
|
#define SPT_PWM_GRANULARITY (1<<0)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define SOUTH_CHICKEN2 _MMIO(0xc2004)
|
2012-12-01 14:04:25 +00:00
|
|
|
#define FDI_MPHY_IOSFSB_RESET_STATUS (1<<13)
|
|
|
|
#define FDI_MPHY_IOSFSB_RESET_CTL (1<<12)
|
2015-09-04 13:55:14 +00:00
|
|
|
#define LPT_PWM_GRANULARITY (1<<5)
|
2012-12-01 14:04:25 +00:00
|
|
|
#define DPLS_EDP_PPS_FIX_DIS (1<<0)
|
2011-05-11 16:49:31 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define _FDI_RXA_CHICKEN 0xc200c
|
|
|
|
#define _FDI_RXB_CHICKEN 0xc2010
|
2011-01-04 23:09:38 +00:00
|
|
|
#define FDI_RX_PHASE_SYNC_POINTER_OVR (1<<1)
|
|
|
|
#define FDI_RX_PHASE_SYNC_POINTER_EN (1<<0)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define FDI_RX_CHICKEN(pipe) _MMIO_PIPE(pipe, _FDI_RXA_CHICKEN, _FDI_RXB_CHICKEN)
|
2009-06-05 07:38:38 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define SOUTH_DSPCLK_GATE_D _MMIO(0xc2020)
|
2013-10-02 17:34:19 +00:00
|
|
|
#define PCH_DPLUNIT_CLOCK_GATE_DISABLE (1<<30)
|
2010-10-07 23:01:25 +00:00
|
|
|
#define PCH_DPLSUNIT_CLOCK_GATE_DISABLE (1<<29)
|
2013-10-02 17:34:19 +00:00
|
|
|
#define PCH_CPUNIT_CLOCK_GATE_DISABLE (1<<14)
|
2012-11-20 17:12:07 +00:00
|
|
|
#define PCH_LP_PARTITION_LEVEL_DISABLE (1<<12)
|
2010-10-07 23:01:25 +00:00
|
|
|
|
2009-06-05 07:38:38 +00:00
|
|
|
/* CPU: FDI_TX */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define _FDI_TXA_CTL 0x60100
|
|
|
|
#define _FDI_TXB_CTL 0x61100
|
|
|
|
#define FDI_TX_CTL(pipe) _MMIO_PIPE(pipe, _FDI_TXA_CTL, _FDI_TXB_CTL)
|
2009-06-05 07:38:38 +00:00
|
|
|
#define FDI_TX_DISABLE (0<<31)
|
|
|
|
#define FDI_TX_ENABLE (1<<31)
|
|
|
|
#define FDI_LINK_TRAIN_PATTERN_1 (0<<28)
|
|
|
|
#define FDI_LINK_TRAIN_PATTERN_2 (1<<28)
|
|
|
|
#define FDI_LINK_TRAIN_PATTERN_IDLE (2<<28)
|
|
|
|
#define FDI_LINK_TRAIN_NONE (3<<28)
|
|
|
|
#define FDI_LINK_TRAIN_VOLTAGE_0_4V (0<<25)
|
|
|
|
#define FDI_LINK_TRAIN_VOLTAGE_0_6V (1<<25)
|
|
|
|
#define FDI_LINK_TRAIN_VOLTAGE_0_8V (2<<25)
|
|
|
|
#define FDI_LINK_TRAIN_VOLTAGE_1_2V (3<<25)
|
|
|
|
#define FDI_LINK_TRAIN_PRE_EMPHASIS_NONE (0<<22)
|
|
|
|
#define FDI_LINK_TRAIN_PRE_EMPHASIS_1_5X (1<<22)
|
|
|
|
#define FDI_LINK_TRAIN_PRE_EMPHASIS_2X (2<<22)
|
|
|
|
#define FDI_LINK_TRAIN_PRE_EMPHASIS_3X (3<<22)
|
2010-04-07 08:15:54 +00:00
|
|
|
/* ILK always use 400mV 0dB for voltage swing and pre-emphasis level.
|
|
|
|
SNB has different settings. */
|
|
|
|
/* SNB A-stepping */
|
|
|
|
#define FDI_LINK_TRAIN_400MV_0DB_SNB_A (0x38<<22)
|
|
|
|
#define FDI_LINK_TRAIN_400MV_6DB_SNB_A (0x02<<22)
|
|
|
|
#define FDI_LINK_TRAIN_600MV_3_5DB_SNB_A (0x01<<22)
|
|
|
|
#define FDI_LINK_TRAIN_800MV_0DB_SNB_A (0x0<<22)
|
|
|
|
/* SNB B-stepping */
|
|
|
|
#define FDI_LINK_TRAIN_400MV_0DB_SNB_B (0x0<<22)
|
|
|
|
#define FDI_LINK_TRAIN_400MV_6DB_SNB_B (0x3a<<22)
|
|
|
|
#define FDI_LINK_TRAIN_600MV_3_5DB_SNB_B (0x39<<22)
|
|
|
|
#define FDI_LINK_TRAIN_800MV_0DB_SNB_B (0x38<<22)
|
|
|
|
#define FDI_LINK_TRAIN_VOL_EMP_MASK (0x3f<<22)
|
2013-04-29 17:33:42 +00:00
|
|
|
#define FDI_DP_PORT_WIDTH_SHIFT 19
|
|
|
|
#define FDI_DP_PORT_WIDTH_MASK (7 << FDI_DP_PORT_WIDTH_SHIFT)
|
|
|
|
#define FDI_DP_PORT_WIDTH(width) (((width) - 1) << FDI_DP_PORT_WIDTH_SHIFT)
|
2009-06-05 07:38:38 +00:00
|
|
|
#define FDI_TX_ENHANCE_FRAME_ENABLE (1<<18)
|
2009-12-03 22:14:42 +00:00
|
|
|
/* Ironlake: hardwired to 1 */
|
2009-06-05 07:38:38 +00:00
|
|
|
#define FDI_TX_PLL_ENABLE (1<<14)
|
2011-04-28 22:09:55 +00:00
|
|
|
|
|
|
|
/* Ivybridge has different bits for lolz */
|
|
|
|
#define FDI_LINK_TRAIN_PATTERN_1_IVB (0<<8)
|
|
|
|
#define FDI_LINK_TRAIN_PATTERN_2_IVB (1<<8)
|
|
|
|
#define FDI_LINK_TRAIN_PATTERN_IDLE_IVB (2<<8)
|
|
|
|
#define FDI_LINK_TRAIN_NONE_IVB (3<<8)
|
|
|
|
|
2009-06-05 07:38:38 +00:00
|
|
|
/* both Tx and Rx */
|
2011-10-10 21:28:52 +00:00
|
|
|
#define FDI_COMPOSITE_SYNC (1<<11)
|
2011-04-28 22:09:55 +00:00
|
|
|
#define FDI_LINK_TRAIN_AUTO (1<<10)
|
2009-06-05 07:38:38 +00:00
|
|
|
#define FDI_SCRAMBLING_ENABLE (0<<7)
|
|
|
|
#define FDI_SCRAMBLING_DISABLE (1<<7)
|
|
|
|
|
|
|
|
/* FDI_RX, FDI_X is hard-wired to Transcoder_X */
|
2011-02-07 20:26:52 +00:00
|
|
|
#define _FDI_RXA_CTL 0xf000c
|
|
|
|
#define _FDI_RXB_CTL 0xf100c
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define FDI_RX_CTL(pipe) _MMIO_PIPE(pipe, _FDI_RXA_CTL, _FDI_RXB_CTL)
|
2009-06-05 07:38:38 +00:00
|
|
|
#define FDI_RX_ENABLE (1<<31)
|
|
|
|
/* train, dp width same as FDI_TX */
|
2011-04-28 22:09:55 +00:00
|
|
|
#define FDI_FS_ERRC_ENABLE (1<<27)
|
|
|
|
#define FDI_FE_ERRC_ENABLE (1<<26)
|
2012-12-01 14:04:26 +00:00
|
|
|
#define FDI_RX_POLARITY_REVERSED_LPT (1<<16)
|
2009-06-05 07:38:38 +00:00
|
|
|
#define FDI_8BPC (0<<16)
|
|
|
|
#define FDI_10BPC (1<<16)
|
|
|
|
#define FDI_6BPC (2<<16)
|
|
|
|
#define FDI_12BPC (3<<16)
|
2012-12-11 18:48:29 +00:00
|
|
|
#define FDI_RX_LINK_REVERSAL_OVERRIDE (1<<15)
|
2009-06-05 07:38:38 +00:00
|
|
|
#define FDI_DMI_LINK_REVERSE_MASK (1<<14)
|
|
|
|
#define FDI_RX_PLL_ENABLE (1<<13)
|
|
|
|
#define FDI_FS_ERR_CORRECT_ENABLE (1<<11)
|
|
|
|
#define FDI_FE_ERR_CORRECT_ENABLE (1<<10)
|
|
|
|
#define FDI_FS_ERR_REPORT_ENABLE (1<<9)
|
|
|
|
#define FDI_FE_ERR_REPORT_ENABLE (1<<8)
|
|
|
|
#define FDI_RX_ENHANCE_FRAME_ENABLE (1<<6)
|
2010-09-11 12:48:45 +00:00
|
|
|
#define FDI_PCDCLK (1<<4)
|
2010-04-07 08:15:54 +00:00
|
|
|
/* CPT */
|
|
|
|
#define FDI_AUTO_TRAINING (1<<10)
|
|
|
|
#define FDI_LINK_TRAIN_PATTERN_1_CPT (0<<8)
|
|
|
|
#define FDI_LINK_TRAIN_PATTERN_2_CPT (1<<8)
|
|
|
|
#define FDI_LINK_TRAIN_PATTERN_IDLE_CPT (2<<8)
|
|
|
|
#define FDI_LINK_TRAIN_NORMAL_CPT (3<<8)
|
|
|
|
#define FDI_LINK_TRAIN_PATTERN_MASK_CPT (3<<8)
|
2009-06-05 07:38:38 +00:00
|
|
|
|
drm/i915: fix Haswell FDI link training code
This commit makes hsw_fdi_link_train responsible for implementing
everything described in the "Enable and train FDI" section from the
Hawell CRT mode set sequence documentation. We completely rewrite
hsw_fdi_link_train to match the documentation and we also call it in
the right place.
This patch was initially sent as a series of tiny patches fixing every
little problem of the function, but since there were too many patches
fixing the same function it got a little difficult to get the "big
picture" of how the function would be in the end, so here we amended
all the patches into a single big patch fixing the whole function.
Problems we fixed:
1 - Train Haswell FDI at the right time.
We need to train the FDI before enabling the pipes and planes, so
we're moving the call from lpt_pch_enable to haswell_crtc_enable
directly.
We are also removing ironlake_fdi_pll_enable since the PLL
enablement on Haswell is completely different and is also done
during the link training steps.
2 - Use the right FDI_RX_CTL register on Haswell
There is only one PCH transcoder, so it's always _FDI_RXA_CTL.
Using "pipe" here is wrong.
3 - Don't rely on DDI_BUF_CTL previous values
Just set the bits we want, everything else is zero. Also
POSTING_READ the register before sleeping.
4 - Program the FDI RX TUSIZE register on hsw_fdi_link_train
According to the mode set sequence documentation, this is the
right place. According to the FDI_RX_TUSIZE register description,
this is the value we should set.
Also remove the code that sets this register from the old
location: lpt_pch_enable.
5 - Properly program FDI_RX_MISC pwrdn lane values on HSW
6 - Wait only 35us for the FDI link training
First we wait 30us for the FDI receiver lane calibration, then we
wait 5us for the FDI auto training time.
7 - Remove an useless indentation level on hsw_fdi_link_train
We already "break" when the link training succeeds.
8 - Disable FDI_RX_ENABLE, not FDI_RX_PLL_ENABLE
When we fail the training.
9 - Change Haswell FDI link training error messages
We shouldn't call DRM_ERROR when still looping through voltage
levels since this is expected and not really a failure. So in this
commit we adjust the error path to only DRM_ERROR when we really
fail after trying everything.
While at it, replace DRM_DEBUG_DRIVER with DRM_DEBUG_KMS since
it's what we use everywhere.
10 - Try each voltage twice at hsw_fdi_link_train
Now with Daniel Vetter's suggestion to use "/2" instead of ">>1".
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
[danvet: Applied tiny bikesheds:
- mention in comment that we test each voltage/emphasis level twice
- realing arguments of the only untouched reg write, it spilled over
the 80 char limit ...]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-11-01 23:00:59 +00:00
|
|
|
#define _FDI_RXA_MISC 0xf0010
|
|
|
|
#define _FDI_RXB_MISC 0xf1010
|
|
|
|
#define FDI_RX_PWRDN_LANE1_MASK (3<<26)
|
|
|
|
#define FDI_RX_PWRDN_LANE1_VAL(x) ((x)<<26)
|
|
|
|
#define FDI_RX_PWRDN_LANE0_MASK (3<<24)
|
|
|
|
#define FDI_RX_PWRDN_LANE0_VAL(x) ((x)<<24)
|
|
|
|
#define FDI_RX_TP1_TO_TP2_48 (2<<20)
|
|
|
|
#define FDI_RX_TP1_TO_TP2_64 (3<<20)
|
|
|
|
#define FDI_RX_FDI_DELAY_90 (0x90<<0)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define FDI_RX_MISC(pipe) _MMIO_PIPE(pipe, _FDI_RXA_MISC, _FDI_RXB_MISC)
|
drm/i915: fix Haswell FDI link training code
This commit makes hsw_fdi_link_train responsible for implementing
everything described in the "Enable and train FDI" section from the
Hawell CRT mode set sequence documentation. We completely rewrite
hsw_fdi_link_train to match the documentation and we also call it in
the right place.
This patch was initially sent as a series of tiny patches fixing every
little problem of the function, but since there were too many patches
fixing the same function it got a little difficult to get the "big
picture" of how the function would be in the end, so here we amended
all the patches into a single big patch fixing the whole function.
Problems we fixed:
1 - Train Haswell FDI at the right time.
We need to train the FDI before enabling the pipes and planes, so
we're moving the call from lpt_pch_enable to haswell_crtc_enable
directly.
We are also removing ironlake_fdi_pll_enable since the PLL
enablement on Haswell is completely different and is also done
during the link training steps.
2 - Use the right FDI_RX_CTL register on Haswell
There is only one PCH transcoder, so it's always _FDI_RXA_CTL.
Using "pipe" here is wrong.
3 - Don't rely on DDI_BUF_CTL previous values
Just set the bits we want, everything else is zero. Also
POSTING_READ the register before sleeping.
4 - Program the FDI RX TUSIZE register on hsw_fdi_link_train
According to the mode set sequence documentation, this is the
right place. According to the FDI_RX_TUSIZE register description,
this is the value we should set.
Also remove the code that sets this register from the old
location: lpt_pch_enable.
5 - Properly program FDI_RX_MISC pwrdn lane values on HSW
6 - Wait only 35us for the FDI link training
First we wait 30us for the FDI receiver lane calibration, then we
wait 5us for the FDI auto training time.
7 - Remove an useless indentation level on hsw_fdi_link_train
We already "break" when the link training succeeds.
8 - Disable FDI_RX_ENABLE, not FDI_RX_PLL_ENABLE
When we fail the training.
9 - Change Haswell FDI link training error messages
We shouldn't call DRM_ERROR when still looping through voltage
levels since this is expected and not really a failure. So in this
commit we adjust the error path to only DRM_ERROR when we really
fail after trying everything.
While at it, replace DRM_DEBUG_DRIVER with DRM_DEBUG_KMS since
it's what we use everywhere.
10 - Try each voltage twice at hsw_fdi_link_train
Now with Daniel Vetter's suggestion to use "/2" instead of ">>1".
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
[danvet: Applied tiny bikesheds:
- mention in comment that we test each voltage/emphasis level twice
- realing arguments of the only untouched reg write, it spilled over
the 80 char limit ...]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-11-01 23:00:59 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define _FDI_RXA_TUSIZE1 0xf0030
|
|
|
|
#define _FDI_RXA_TUSIZE2 0xf0038
|
|
|
|
#define _FDI_RXB_TUSIZE1 0xf1030
|
|
|
|
#define _FDI_RXB_TUSIZE2 0xf1038
|
|
|
|
#define FDI_RX_TUSIZE1(pipe) _MMIO_PIPE(pipe, _FDI_RXA_TUSIZE1, _FDI_RXB_TUSIZE1)
|
|
|
|
#define FDI_RX_TUSIZE2(pipe) _MMIO_PIPE(pipe, _FDI_RXA_TUSIZE2, _FDI_RXB_TUSIZE2)
|
2009-06-05 07:38:38 +00:00
|
|
|
|
|
|
|
/* FDI_RX interrupt register format */
|
|
|
|
#define FDI_RX_INTER_LANE_ALIGN (1<<10)
|
|
|
|
#define FDI_RX_SYMBOL_LOCK (1<<9) /* train 2 */
|
|
|
|
#define FDI_RX_BIT_LOCK (1<<8) /* train 1 */
|
|
|
|
#define FDI_RX_TRAIN_PATTERN_2_FAIL (1<<7)
|
|
|
|
#define FDI_RX_FS_CODE_ERR (1<<6)
|
|
|
|
#define FDI_RX_FE_CODE_ERR (1<<5)
|
|
|
|
#define FDI_RX_SYMBOL_ERR_RATE_ABOVE (1<<4)
|
|
|
|
#define FDI_RX_HDCP_LINK_FAIL (1<<3)
|
|
|
|
#define FDI_RX_PIXEL_FIFO_OVERFLOW (1<<2)
|
|
|
|
#define FDI_RX_CROSS_CLOCK_OVERFLOW (1<<1)
|
|
|
|
#define FDI_RX_SYMBOL_QUEUE_OVERFLOW (1<<0)
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define _FDI_RXA_IIR 0xf0014
|
|
|
|
#define _FDI_RXA_IMR 0xf0018
|
|
|
|
#define _FDI_RXB_IIR 0xf1014
|
|
|
|
#define _FDI_RXB_IMR 0xf1018
|
|
|
|
#define FDI_RX_IIR(pipe) _MMIO_PIPE(pipe, _FDI_RXA_IIR, _FDI_RXB_IIR)
|
|
|
|
#define FDI_RX_IMR(pipe) _MMIO_PIPE(pipe, _FDI_RXA_IMR, _FDI_RXB_IMR)
|
2009-06-05 07:38:38 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define FDI_PLL_CTL_1 _MMIO(0xfe000)
|
|
|
|
#define FDI_PLL_CTL_2 _MMIO(0xfe004)
|
2009-06-05 07:38:38 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define PCH_LVDS _MMIO(0xe1180)
|
2009-06-05 07:38:38 +00:00
|
|
|
#define LVDS_DETECTED (1 << 1)
|
|
|
|
|
2012-06-15 18:55:14 +00:00
|
|
|
/* vlv has 2 sets of panel control regs. */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define _PIPEA_PP_STATUS (VLV_DISPLAY_BASE + 0x61200)
|
|
|
|
#define _PIPEA_PP_CONTROL (VLV_DISPLAY_BASE + 0x61204)
|
|
|
|
#define _PIPEA_PP_ON_DELAYS (VLV_DISPLAY_BASE + 0x61208)
|
2014-08-18 19:15:56 +00:00
|
|
|
#define PANEL_PORT_SELECT_VLV(port) ((port) << 30)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define _PIPEA_PP_OFF_DELAYS (VLV_DISPLAY_BASE + 0x6120c)
|
|
|
|
#define _PIPEA_PP_DIVISOR (VLV_DISPLAY_BASE + 0x61210)
|
|
|
|
|
|
|
|
#define _PIPEB_PP_STATUS (VLV_DISPLAY_BASE + 0x61300)
|
|
|
|
#define _PIPEB_PP_CONTROL (VLV_DISPLAY_BASE + 0x61304)
|
|
|
|
#define _PIPEB_PP_ON_DELAYS (VLV_DISPLAY_BASE + 0x61308)
|
|
|
|
#define _PIPEB_PP_OFF_DELAYS (VLV_DISPLAY_BASE + 0x6130c)
|
|
|
|
#define _PIPEB_PP_DIVISOR (VLV_DISPLAY_BASE + 0x61310)
|
|
|
|
|
|
|
|
#define VLV_PIPE_PP_STATUS(pipe) _MMIO_PIPE(pipe, _PIPEA_PP_STATUS, _PIPEB_PP_STATUS)
|
|
|
|
#define VLV_PIPE_PP_CONTROL(pipe) _MMIO_PIPE(pipe, _PIPEA_PP_CONTROL, _PIPEB_PP_CONTROL)
|
|
|
|
#define VLV_PIPE_PP_ON_DELAYS(pipe) _MMIO_PIPE(pipe, _PIPEA_PP_ON_DELAYS, _PIPEB_PP_ON_DELAYS)
|
|
|
|
#define VLV_PIPE_PP_OFF_DELAYS(pipe) _MMIO_PIPE(pipe, _PIPEA_PP_OFF_DELAYS, _PIPEB_PP_OFF_DELAYS)
|
|
|
|
#define VLV_PIPE_PP_DIVISOR(pipe) _MMIO_PIPE(pipe, _PIPEA_PP_DIVISOR, _PIPEB_PP_DIVISOR)
|
|
|
|
|
|
|
|
#define _PCH_PP_STATUS 0xc7200
|
|
|
|
#define _PCH_PP_CONTROL 0xc7204
|
2010-07-22 20:18:18 +00:00
|
|
|
#define PANEL_UNLOCK_REGS (0xabcd << 16)
|
2011-09-19 20:59:29 +00:00
|
|
|
#define PANEL_UNLOCK_MASK (0xffff << 16)
|
2015-06-18 05:30:55 +00:00
|
|
|
#define BXT_POWER_CYCLE_DELAY_MASK (0x1f0)
|
|
|
|
#define BXT_POWER_CYCLE_DELAY_SHIFT 4
|
2009-06-05 07:38:38 +00:00
|
|
|
#define EDP_FORCE_VDD (1 << 3)
|
|
|
|
#define EDP_BLC_ENABLE (1 << 2)
|
|
|
|
#define PANEL_POWER_RESET (1 << 1)
|
|
|
|
#define PANEL_POWER_OFF (0 << 0)
|
|
|
|
#define PANEL_POWER_ON (1 << 0)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define _PCH_PP_ON_DELAYS 0xc7208
|
drm/i915: Correct eDP panel power sequencing delay computations
Store the panel power sequencing delays in the dp private structure,
rather than the global device structure. Who knows, maybe we'll get
more than one eDP device in the future.
From the eDP spec, we need the following numbers:
T1 + T3 Power on to Aux Channel operation (panel_power_up_delay)
This marks how long it takes the panel to boot up and
get ready to receive aux channel communications.
T8 Video signal to backlight on (backlight_on_delay)
Once a valid video signal is being sent to the device,
it can take a while before the panel is actuall
showing useful data. This delay allows the panel
to get something reasonable up before the backlight
is turned on.
T9 Backlight off to video off (backlight_off_delay)
Turning the backlight off can take a moment, so
this delay makes sure there is still valid video
data on the screen.
T10 Video off to power off (panel_power_down_delay)
Presumably this delay allows the panel to perform
an orderly shutdown of the display.
T11 + T12 Power off to power on (panel_power_cycle_delay)
So, once you turn the panel off, you have to wait a
while before you can turn it back on. This delay is
usually the longest in the entire sequence.
Neither the VBIOS source code nor the hardware documentation has a
clear mapping between the delay values they provide and those required
by the eDP spec. The VBIOS code actually uses two different labels for
the delay values in the five words of the relevant VBT table.
**** MORE LATER ***
Look at both the current hardware register settings and the VBT
specified panel power sequencing timings. Use the maximum of the two
delays, to make sure things work reliably. If there is no VBT data,
then those values will be initialized to zero, so we'll just use the
values as programmed in the hardware. Note that the BIOS just fetches
delays from the VBT table to place in the hardware registers, so we
should get the same values from both places, except for rounding.
VBT doesn't provide any values for T1 or T2, so we'll always just use
the hardware value for that.
The panel power up delay is thus T1 + T2 + T3, which should be
sufficient in all cases.
The panel power down delay is T1 + T2 + T12, using T1+T2 as a proxy
for T11, which isn't available anywhere.
For the backlight delays, the eDP spec says T6 + T8 is the delay from the
end of link training to backlight on and T9 is the delay from
backlight off until video off. The hardware provides a 'backlight on'
delay, which I'm taking to be T6 + T8 while the VBT provides something
called 'T7', which I'm assuming is s
On the macbook air I'm testing with, this yields a power-up delay of
over 200ms and a power-down delay of over 600ms. It all works now, but
we're frobbing these power controls several times during mode setting,
making the whole process take an awfully long time.
Signed-off-by: Keith Packard <keithp@keithp.com>
2011-09-28 23:48:10 +00:00
|
|
|
#define PANEL_PORT_SELECT_MASK (3 << 30)
|
|
|
|
#define PANEL_PORT_SELECT_LVDS (0 << 30)
|
|
|
|
#define PANEL_PORT_SELECT_DPA (1 << 30)
|
|
|
|
#define PANEL_PORT_SELECT_DPC (2 << 30)
|
|
|
|
#define PANEL_PORT_SELECT_DPD (3 << 30)
|
|
|
|
#define PANEL_POWER_UP_DELAY_MASK (0x1fff0000)
|
|
|
|
#define PANEL_POWER_UP_DELAY_SHIFT 16
|
|
|
|
#define PANEL_LIGHT_ON_DELAY_MASK (0x1fff)
|
|
|
|
#define PANEL_LIGHT_ON_DELAY_SHIFT 0
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define _PCH_PP_OFF_DELAYS 0xc720c
|
drm/i915: Correct eDP panel power sequencing delay computations
Store the panel power sequencing delays in the dp private structure,
rather than the global device structure. Who knows, maybe we'll get
more than one eDP device in the future.
From the eDP spec, we need the following numbers:
T1 + T3 Power on to Aux Channel operation (panel_power_up_delay)
This marks how long it takes the panel to boot up and
get ready to receive aux channel communications.
T8 Video signal to backlight on (backlight_on_delay)
Once a valid video signal is being sent to the device,
it can take a while before the panel is actuall
showing useful data. This delay allows the panel
to get something reasonable up before the backlight
is turned on.
T9 Backlight off to video off (backlight_off_delay)
Turning the backlight off can take a moment, so
this delay makes sure there is still valid video
data on the screen.
T10 Video off to power off (panel_power_down_delay)
Presumably this delay allows the panel to perform
an orderly shutdown of the display.
T11 + T12 Power off to power on (panel_power_cycle_delay)
So, once you turn the panel off, you have to wait a
while before you can turn it back on. This delay is
usually the longest in the entire sequence.
Neither the VBIOS source code nor the hardware documentation has a
clear mapping between the delay values they provide and those required
by the eDP spec. The VBIOS code actually uses two different labels for
the delay values in the five words of the relevant VBT table.
**** MORE LATER ***
Look at both the current hardware register settings and the VBT
specified panel power sequencing timings. Use the maximum of the two
delays, to make sure things work reliably. If there is no VBT data,
then those values will be initialized to zero, so we'll just use the
values as programmed in the hardware. Note that the BIOS just fetches
delays from the VBT table to place in the hardware registers, so we
should get the same values from both places, except for rounding.
VBT doesn't provide any values for T1 or T2, so we'll always just use
the hardware value for that.
The panel power up delay is thus T1 + T2 + T3, which should be
sufficient in all cases.
The panel power down delay is T1 + T2 + T12, using T1+T2 as a proxy
for T11, which isn't available anywhere.
For the backlight delays, the eDP spec says T6 + T8 is the delay from the
end of link training to backlight on and T9 is the delay from
backlight off until video off. The hardware provides a 'backlight on'
delay, which I'm taking to be T6 + T8 while the VBT provides something
called 'T7', which I'm assuming is s
On the macbook air I'm testing with, this yields a power-up delay of
over 200ms and a power-down delay of over 600ms. It all works now, but
we're frobbing these power controls several times during mode setting,
making the whole process take an awfully long time.
Signed-off-by: Keith Packard <keithp@keithp.com>
2011-09-28 23:48:10 +00:00
|
|
|
#define PANEL_POWER_DOWN_DELAY_MASK (0x1fff0000)
|
|
|
|
#define PANEL_POWER_DOWN_DELAY_SHIFT 16
|
|
|
|
#define PANEL_LIGHT_OFF_DELAY_MASK (0x1fff)
|
|
|
|
#define PANEL_LIGHT_OFF_DELAY_SHIFT 0
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define _PCH_PP_DIVISOR 0xc7210
|
drm/i915: Correct eDP panel power sequencing delay computations
Store the panel power sequencing delays in the dp private structure,
rather than the global device structure. Who knows, maybe we'll get
more than one eDP device in the future.
From the eDP spec, we need the following numbers:
T1 + T3 Power on to Aux Channel operation (panel_power_up_delay)
This marks how long it takes the panel to boot up and
get ready to receive aux channel communications.
T8 Video signal to backlight on (backlight_on_delay)
Once a valid video signal is being sent to the device,
it can take a while before the panel is actuall
showing useful data. This delay allows the panel
to get something reasonable up before the backlight
is turned on.
T9 Backlight off to video off (backlight_off_delay)
Turning the backlight off can take a moment, so
this delay makes sure there is still valid video
data on the screen.
T10 Video off to power off (panel_power_down_delay)
Presumably this delay allows the panel to perform
an orderly shutdown of the display.
T11 + T12 Power off to power on (panel_power_cycle_delay)
So, once you turn the panel off, you have to wait a
while before you can turn it back on. This delay is
usually the longest in the entire sequence.
Neither the VBIOS source code nor the hardware documentation has a
clear mapping between the delay values they provide and those required
by the eDP spec. The VBIOS code actually uses two different labels for
the delay values in the five words of the relevant VBT table.
**** MORE LATER ***
Look at both the current hardware register settings and the VBT
specified panel power sequencing timings. Use the maximum of the two
delays, to make sure things work reliably. If there is no VBT data,
then those values will be initialized to zero, so we'll just use the
values as programmed in the hardware. Note that the BIOS just fetches
delays from the VBT table to place in the hardware registers, so we
should get the same values from both places, except for rounding.
VBT doesn't provide any values for T1 or T2, so we'll always just use
the hardware value for that.
The panel power up delay is thus T1 + T2 + T3, which should be
sufficient in all cases.
The panel power down delay is T1 + T2 + T12, using T1+T2 as a proxy
for T11, which isn't available anywhere.
For the backlight delays, the eDP spec says T6 + T8 is the delay from the
end of link training to backlight on and T9 is the delay from
backlight off until video off. The hardware provides a 'backlight on'
delay, which I'm taking to be T6 + T8 while the VBT provides something
called 'T7', which I'm assuming is s
On the macbook air I'm testing with, this yields a power-up delay of
over 200ms and a power-down delay of over 600ms. It all works now, but
we're frobbing these power controls several times during mode setting,
making the whole process take an awfully long time.
Signed-off-by: Keith Packard <keithp@keithp.com>
2011-09-28 23:48:10 +00:00
|
|
|
#define PP_REFERENCE_DIVIDER_MASK (0xffffff00)
|
|
|
|
#define PP_REFERENCE_DIVIDER_SHIFT 8
|
|
|
|
#define PANEL_POWER_CYCLE_DELAY_MASK (0x1f)
|
|
|
|
#define PANEL_POWER_CYCLE_DELAY_SHIFT 0
|
2009-06-05 07:38:38 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define PCH_PP_STATUS _MMIO(_PCH_PP_STATUS)
|
|
|
|
#define PCH_PP_CONTROL _MMIO(_PCH_PP_CONTROL)
|
|
|
|
#define PCH_PP_ON_DELAYS _MMIO(_PCH_PP_ON_DELAYS)
|
|
|
|
#define PCH_PP_OFF_DELAYS _MMIO(_PCH_PP_OFF_DELAYS)
|
|
|
|
#define PCH_PP_DIVISOR _MMIO(_PCH_PP_DIVISOR)
|
|
|
|
|
2015-06-18 05:30:55 +00:00
|
|
|
/* BXT PPS changes - 2nd set of PPS registers */
|
|
|
|
#define _BXT_PP_STATUS2 0xc7300
|
|
|
|
#define _BXT_PP_CONTROL2 0xc7304
|
|
|
|
#define _BXT_PP_ON_DELAYS2 0xc7308
|
|
|
|
#define _BXT_PP_OFF_DELAYS2 0xc730c
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define BXT_PP_STATUS(n) _MMIO_PIPE(n, _PCH_PP_STATUS, _BXT_PP_STATUS2)
|
|
|
|
#define BXT_PP_CONTROL(n) _MMIO_PIPE(n, _PCH_PP_CONTROL, _BXT_PP_CONTROL2)
|
|
|
|
#define BXT_PP_ON_DELAYS(n) _MMIO_PIPE(n, _PCH_PP_ON_DELAYS, _BXT_PP_ON_DELAYS2)
|
|
|
|
#define BXT_PP_OFF_DELAYS(n) _MMIO_PIPE(n, _PCH_PP_OFF_DELAYS, _BXT_PP_OFF_DELAYS2)
|
2015-06-18 05:30:55 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define _PCH_DP_B 0xe4100
|
|
|
|
#define PCH_DP_B _MMIO(_PCH_DP_B)
|
2015-11-11 18:34:12 +00:00
|
|
|
#define _PCH_DPB_AUX_CH_CTL 0xe4110
|
|
|
|
#define _PCH_DPB_AUX_CH_DATA1 0xe4114
|
|
|
|
#define _PCH_DPB_AUX_CH_DATA2 0xe4118
|
|
|
|
#define _PCH_DPB_AUX_CH_DATA3 0xe411c
|
|
|
|
#define _PCH_DPB_AUX_CH_DATA4 0xe4120
|
|
|
|
#define _PCH_DPB_AUX_CH_DATA5 0xe4124
|
2009-07-23 17:00:31 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define _PCH_DP_C 0xe4200
|
|
|
|
#define PCH_DP_C _MMIO(_PCH_DP_C)
|
2015-11-11 18:34:12 +00:00
|
|
|
#define _PCH_DPC_AUX_CH_CTL 0xe4210
|
|
|
|
#define _PCH_DPC_AUX_CH_DATA1 0xe4214
|
|
|
|
#define _PCH_DPC_AUX_CH_DATA2 0xe4218
|
|
|
|
#define _PCH_DPC_AUX_CH_DATA3 0xe421c
|
|
|
|
#define _PCH_DPC_AUX_CH_DATA4 0xe4220
|
|
|
|
#define _PCH_DPC_AUX_CH_DATA5 0xe4224
|
2009-07-23 17:00:31 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define _PCH_DP_D 0xe4300
|
|
|
|
#define PCH_DP_D _MMIO(_PCH_DP_D)
|
2015-11-11 18:34:12 +00:00
|
|
|
#define _PCH_DPD_AUX_CH_CTL 0xe4310
|
|
|
|
#define _PCH_DPD_AUX_CH_DATA1 0xe4314
|
|
|
|
#define _PCH_DPD_AUX_CH_DATA2 0xe4318
|
|
|
|
#define _PCH_DPD_AUX_CH_DATA3 0xe431c
|
|
|
|
#define _PCH_DPD_AUX_CH_DATA4 0xe4320
|
|
|
|
#define _PCH_DPD_AUX_CH_DATA5 0xe4324
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define PCH_DP_AUX_CH_CTL(port) _MMIO_PORT((port) - PORT_B, _PCH_DPB_AUX_CH_CTL, _PCH_DPC_AUX_CH_CTL)
|
|
|
|
#define PCH_DP_AUX_CH_DATA(port, i) _MMIO(_PORT((port) - PORT_B, _PCH_DPB_AUX_CH_DATA1, _PCH_DPC_AUX_CH_DATA1) + (i) * 4) /* 5 registers */
|
2009-07-23 17:00:31 +00:00
|
|
|
|
2010-04-07 08:15:54 +00:00
|
|
|
/* CPT */
|
|
|
|
#define PORT_TRANS_A_SEL_CPT 0
|
|
|
|
#define PORT_TRANS_B_SEL_CPT (1<<29)
|
|
|
|
#define PORT_TRANS_C_SEL_CPT (2<<29)
|
|
|
|
#define PORT_TRANS_SEL_MASK (3<<29)
|
2011-08-06 17:35:34 +00:00
|
|
|
#define PORT_TRANS_SEL_CPT(pipe) ((pipe) << 29)
|
2012-07-02 11:26:27 +00:00
|
|
|
#define PORT_TO_PIPE(val) (((val) & (1<<30)) >> 30)
|
|
|
|
#define PORT_TO_PIPE_CPT(val) (((val) & PORT_TRANS_SEL_MASK) >> 29)
|
2014-04-09 10:28:55 +00:00
|
|
|
#define SDVO_PORT_TO_PIPE_CHV(val) (((val) & (3<<24)) >> 24)
|
|
|
|
#define DP_PORT_TO_PIPE_CHV(val) (((val) & (3<<16)) >> 16)
|
2010-04-07 08:15:54 +00:00
|
|
|
|
2015-11-04 21:20:01 +00:00
|
|
|
#define _TRANS_DP_CTL_A 0xe0300
|
|
|
|
#define _TRANS_DP_CTL_B 0xe1300
|
|
|
|
#define _TRANS_DP_CTL_C 0xe2300
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define TRANS_DP_CTL(pipe) _MMIO_PIPE(pipe, _TRANS_DP_CTL_A, _TRANS_DP_CTL_B)
|
2010-04-07 08:15:54 +00:00
|
|
|
#define TRANS_DP_OUTPUT_ENABLE (1<<31)
|
|
|
|
#define TRANS_DP_PORT_SEL_B (0<<29)
|
|
|
|
#define TRANS_DP_PORT_SEL_C (1<<29)
|
|
|
|
#define TRANS_DP_PORT_SEL_D (2<<29)
|
2011-02-02 20:08:07 +00:00
|
|
|
#define TRANS_DP_PORT_SEL_NONE (3<<29)
|
2010-04-07 08:15:54 +00:00
|
|
|
#define TRANS_DP_PORT_SEL_MASK (3<<29)
|
2015-05-05 14:17:30 +00:00
|
|
|
#define TRANS_DP_PIPE_TO_PORT(val) ((((val) & TRANS_DP_PORT_SEL_MASK) >> 29) + PORT_B)
|
2010-04-07 08:15:54 +00:00
|
|
|
#define TRANS_DP_AUDIO_ONLY (1<<26)
|
|
|
|
#define TRANS_DP_ENH_FRAMING (1<<18)
|
|
|
|
#define TRANS_DP_8BPC (0<<9)
|
|
|
|
#define TRANS_DP_10BPC (1<<9)
|
|
|
|
#define TRANS_DP_6BPC (2<<9)
|
|
|
|
#define TRANS_DP_12BPC (3<<9)
|
2010-11-18 01:32:58 +00:00
|
|
|
#define TRANS_DP_BPC_MASK (3<<9)
|
2010-04-07 08:15:54 +00:00
|
|
|
#define TRANS_DP_VSYNC_ACTIVE_HIGH (1<<4)
|
|
|
|
#define TRANS_DP_VSYNC_ACTIVE_LOW 0
|
|
|
|
#define TRANS_DP_HSYNC_ACTIVE_HIGH (1<<3)
|
|
|
|
#define TRANS_DP_HSYNC_ACTIVE_LOW 0
|
2010-08-04 10:25:21 +00:00
|
|
|
#define TRANS_DP_SYNC_MASK (3<<3)
|
2010-04-07 08:15:54 +00:00
|
|
|
|
|
|
|
/* SNB eDP training params */
|
|
|
|
/* SNB A-stepping */
|
|
|
|
#define EDP_LINK_TRAIN_400MV_0DB_SNB_A (0x38<<22)
|
|
|
|
#define EDP_LINK_TRAIN_400MV_6DB_SNB_A (0x02<<22)
|
|
|
|
#define EDP_LINK_TRAIN_600MV_3_5DB_SNB_A (0x01<<22)
|
|
|
|
#define EDP_LINK_TRAIN_800MV_0DB_SNB_A (0x0<<22)
|
|
|
|
/* SNB B-stepping */
|
2011-01-06 10:26:08 +00:00
|
|
|
#define EDP_LINK_TRAIN_400_600MV_0DB_SNB_B (0x0<<22)
|
|
|
|
#define EDP_LINK_TRAIN_400MV_3_5DB_SNB_B (0x1<<22)
|
|
|
|
#define EDP_LINK_TRAIN_400_600MV_6DB_SNB_B (0x3a<<22)
|
|
|
|
#define EDP_LINK_TRAIN_600_800MV_3_5DB_SNB_B (0x39<<22)
|
|
|
|
#define EDP_LINK_TRAIN_800_1200MV_0DB_SNB_B (0x38<<22)
|
2010-04-07 08:15:54 +00:00
|
|
|
#define EDP_LINK_TRAIN_VOL_EMP_MASK_SNB (0x3f<<22)
|
|
|
|
|
2011-11-17 00:26:07 +00:00
|
|
|
/* IVB */
|
|
|
|
#define EDP_LINK_TRAIN_400MV_0DB_IVB (0x24 <<22)
|
|
|
|
#define EDP_LINK_TRAIN_400MV_3_5DB_IVB (0x2a <<22)
|
|
|
|
#define EDP_LINK_TRAIN_400MV_6DB_IVB (0x2f <<22)
|
|
|
|
#define EDP_LINK_TRAIN_600MV_0DB_IVB (0x30 <<22)
|
|
|
|
#define EDP_LINK_TRAIN_600MV_3_5DB_IVB (0x36 <<22)
|
|
|
|
#define EDP_LINK_TRAIN_800MV_0DB_IVB (0x38 <<22)
|
2013-08-23 20:50:23 +00:00
|
|
|
#define EDP_LINK_TRAIN_800MV_3_5DB_IVB (0x3e <<22)
|
2011-11-17 00:26:07 +00:00
|
|
|
|
|
|
|
/* legacy values */
|
|
|
|
#define EDP_LINK_TRAIN_500MV_0DB_IVB (0x00 <<22)
|
|
|
|
#define EDP_LINK_TRAIN_1000MV_0DB_IVB (0x20 <<22)
|
|
|
|
#define EDP_LINK_TRAIN_500MV_3_5DB_IVB (0x02 <<22)
|
|
|
|
#define EDP_LINK_TRAIN_1000MV_3_5DB_IVB (0x22 <<22)
|
|
|
|
#define EDP_LINK_TRAIN_1000MV_6DB_IVB (0x23 <<22)
|
|
|
|
|
|
|
|
#define EDP_LINK_TRAIN_VOL_EMP_MASK_IVB (0x3f<<22)
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define VLV_PMWGICZ _MMIO(0x1300a4)
|
2014-05-05 12:13:55 +00:00
|
|
|
|
2016-02-05 18:43:29 +00:00
|
|
|
#define RC6_LOCATION _MMIO(0xD40)
|
|
|
|
#define RC6_CTX_IN_DRAM (1 << 0)
|
|
|
|
#define RC6_CTX_BASE _MMIO(0xD48)
|
|
|
|
#define RC6_CTX_BASE_MASK 0xFFFFFFF0
|
|
|
|
#define PWRCTX_MAXCNT_RCSUNIT _MMIO(0x2054)
|
|
|
|
#define PWRCTX_MAXCNT_VCSUNIT0 _MMIO(0x12054)
|
|
|
|
#define PWRCTX_MAXCNT_BCSUNIT _MMIO(0x22054)
|
|
|
|
#define PWRCTX_MAXCNT_VECSUNIT _MMIO(0x1A054)
|
|
|
|
#define PWRCTX_MAXCNT_VCSUNIT1 _MMIO(0x1C054)
|
|
|
|
#define IDLE_TIME_MASK 0xFFFFF
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define FORCEWAKE _MMIO(0xA18C)
|
|
|
|
#define FORCEWAKE_VLV _MMIO(0x1300b0)
|
|
|
|
#define FORCEWAKE_ACK_VLV _MMIO(0x1300b4)
|
|
|
|
#define FORCEWAKE_MEDIA_VLV _MMIO(0x1300b8)
|
|
|
|
#define FORCEWAKE_ACK_MEDIA_VLV _MMIO(0x1300bc)
|
|
|
|
#define FORCEWAKE_ACK_HSW _MMIO(0x130044)
|
|
|
|
#define FORCEWAKE_ACK _MMIO(0x130090)
|
|
|
|
#define VLV_GTLC_WAKE_CTRL _MMIO(0x130090)
|
2014-04-14 17:24:22 +00:00
|
|
|
#define VLV_GTLC_RENDER_CTX_EXISTS (1 << 25)
|
|
|
|
#define VLV_GTLC_MEDIA_CTX_EXISTS (1 << 24)
|
|
|
|
#define VLV_GTLC_ALLOWWAKEREQ (1 << 0)
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define VLV_GTLC_PW_STATUS _MMIO(0x130094)
|
2014-04-14 17:24:22 +00:00
|
|
|
#define VLV_GTLC_ALLOWWAKEACK (1 << 0)
|
|
|
|
#define VLV_GTLC_ALLOWWAKEERR (1 << 1)
|
|
|
|
#define VLV_GTLC_PW_MEDIA_STATUS_MASK (1 << 5)
|
|
|
|
#define VLV_GTLC_PW_RENDER_STATUS_MASK (1 << 7)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define FORCEWAKE_MT _MMIO(0xa188) /* multi-threaded */
|
|
|
|
#define FORCEWAKE_MEDIA_GEN9 _MMIO(0xa270)
|
|
|
|
#define FORCEWAKE_RENDER_GEN9 _MMIO(0xa278)
|
|
|
|
#define FORCEWAKE_BLITTER_GEN9 _MMIO(0xa188)
|
|
|
|
#define FORCEWAKE_ACK_MEDIA_GEN9 _MMIO(0x0D88)
|
|
|
|
#define FORCEWAKE_ACK_RENDER_GEN9 _MMIO(0x0D84)
|
|
|
|
#define FORCEWAKE_ACK_BLITTER_GEN9 _MMIO(0x130044)
|
2012-10-17 11:09:55 +00:00
|
|
|
#define FORCEWAKE_KERNEL 0x1
|
|
|
|
#define FORCEWAKE_USER 0x2
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define FORCEWAKE_MT_ACK _MMIO(0x130040)
|
|
|
|
#define ECOBUS _MMIO(0xa180)
|
2011-11-19 04:39:01 +00:00
|
|
|
#define FORCEWAKE_MT_ENABLE (1<<5)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define VLV_SPAREG2H _MMIO(0xA194)
|
2010-12-08 18:40:43 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GTFIFODBG _MMIO(0x120000)
|
2016-04-13 18:09:30 +00:00
|
|
|
#define GT_FIFO_SBDEDICATE_FREE_ENTRY_CHV (0x1f << 20)
|
|
|
|
#define GT_FIFO_FREE_ENTRIES_CHV (0x7f << 13)
|
2013-11-13 23:59:59 +00:00
|
|
|
#define GT_FIFO_SBDROPERR (1<<6)
|
|
|
|
#define GT_FIFO_BLOBDROPERR (1<<5)
|
|
|
|
#define GT_FIFO_SB_READ_ABORTERR (1<<4)
|
|
|
|
#define GT_FIFO_DROPERR (1<<3)
|
2012-02-09 09:15:18 +00:00
|
|
|
#define GT_FIFO_OVFERR (1<<2)
|
|
|
|
#define GT_FIFO_IAWRERR (1<<1)
|
|
|
|
#define GT_FIFO_IARDERR (1<<0)
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GTFIFOCTL _MMIO(0x120008)
|
2013-11-14 00:00:00 +00:00
|
|
|
#define GT_FIFO_FREE_ENTRIES_MASK 0x7f
|
2011-05-12 21:17:09 +00:00
|
|
|
#define GT_FIFO_NUM_RESERVED_ENTRIES 20
|
2015-04-16 03:21:28 +00:00
|
|
|
#define GT_FIFO_CTL_BLOCK_ALL_POLICY_STALL (1 << 12)
|
|
|
|
#define GT_FIFO_CTL_RC6_POLICY_STALL (1 << 11)
|
2011-03-04 19:22:40 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define HSW_IDICR _MMIO(0x9008)
|
2013-07-04 18:02:04 +00:00
|
|
|
#define IDIHASHMSK(x) (((x) & 0x3f) << 16)
|
2016-04-13 14:26:43 +00:00
|
|
|
#define HSW_EDRAM_CAP _MMIO(0x120010)
|
2015-02-03 14:25:14 +00:00
|
|
|
#define EDRAM_ENABLED 0x1
|
2016-04-13 14:26:44 +00:00
|
|
|
#define EDRAM_NUM_BANKS(cap) (((cap) >> 1) & 0xf)
|
|
|
|
#define EDRAM_WAYS_IDX(cap) (((cap) >> 5) & 0x7)
|
|
|
|
#define EDRAM_SETS_IDX(cap) (((cap) >> 8) & 0x3)
|
2013-07-04 18:02:04 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN6_UCGCTL1 _MMIO(0x9400)
|
2014-04-09 10:28:41 +00:00
|
|
|
# define GEN6_EU_TCUNIT_CLOCK_GATE_DISABLE (1 << 16)
|
2012-03-31 09:21:57 +00:00
|
|
|
# define GEN6_BLBUNIT_CLOCK_GATE_DISABLE (1 << 5)
|
2012-04-11 18:42:38 +00:00
|
|
|
# define GEN6_CSUNIT_CLOCK_GATE_DISABLE (1 << 7)
|
2012-03-31 09:21:57 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN6_UCGCTL2 _MMIO(0x9404)
|
2015-02-26 18:20:39 +00:00
|
|
|
# define GEN6_VFUNIT_CLOCK_GATE_DISABLE (1 << 31)
|
2012-06-14 18:04:47 +00:00
|
|
|
# define GEN7_VDSUNIT_CLOCK_GATE_DISABLE (1 << 30)
|
2012-06-14 18:04:49 +00:00
|
|
|
# define GEN7_TDLUNIT_CLOCK_GATE_DISABLE (1 << 22)
|
2012-02-08 20:53:49 +00:00
|
|
|
# define GEN6_RCZUNIT_CLOCK_GATE_DISABLE (1 << 13)
|
2011-11-08 00:07:04 +00:00
|
|
|
# define GEN6_RCPBUNIT_CLOCK_GATE_DISABLE (1 << 12)
|
2011-11-08 00:07:05 +00:00
|
|
|
# define GEN6_RCCUNIT_CLOCK_GATE_DISABLE (1 << 11)
|
2011-11-08 00:07:04 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN6_UCGCTL3 _MMIO(0x9408)
|
2014-05-05 12:13:55 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN7_UCGCTL4 _MMIO(0x940c)
|
2012-06-14 18:04:50 +00:00
|
|
|
#define GEN7_L3BANK2X_CLOCK_GATE_DISABLE (1<<25)
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN6_RCGCTL1 _MMIO(0x9410)
|
|
|
|
#define GEN6_RCGCTL2 _MMIO(0x9414)
|
|
|
|
#define GEN6_RSTCTL _MMIO(0x9420)
|
2014-05-05 12:13:55 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN8_UCGCTL6 _MMIO(0x9430)
|
2015-02-09 19:33:10 +00:00
|
|
|
#define GEN8_GAPSUNIT_CLOCK_GATE_DISABLE (1<<24)
|
2014-02-27 19:59:02 +00:00
|
|
|
#define GEN8_SDEUNIT_CLOCK_GATE_DISABLE (1<<14)
|
2015-03-11 08:49:32 +00:00
|
|
|
#define GEN8_HDCUNIT_CLOCK_GATE_DISABLE_HDCREQ (1<<28)
|
2014-02-27 19:59:02 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN6_GFXPAUSE _MMIO(0xA000)
|
|
|
|
#define GEN6_RPNSWREQ _MMIO(0xA008)
|
2010-12-08 18:40:43 +00:00
|
|
|
#define GEN6_TURBO_DISABLE (1<<31)
|
|
|
|
#define GEN6_FREQUENCY(x) ((x)<<25)
|
2013-03-25 20:55:49 +00:00
|
|
|
#define HSW_FREQUENCY(x) ((x)<<24)
|
2015-03-06 05:37:14 +00:00
|
|
|
#define GEN9_FREQUENCY(x) ((x)<<23)
|
2010-12-08 18:40:43 +00:00
|
|
|
#define GEN6_OFFSET(x) ((x)<<19)
|
|
|
|
#define GEN6_AGGRESSIVE_TURBO (0<<15)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN6_RC_VIDEO_FREQ _MMIO(0xA00C)
|
|
|
|
#define GEN6_RC_CONTROL _MMIO(0xA090)
|
2010-12-08 18:40:43 +00:00
|
|
|
#define GEN6_RC_CTL_RC6pp_ENABLE (1<<16)
|
|
|
|
#define GEN6_RC_CTL_RC6p_ENABLE (1<<17)
|
|
|
|
#define GEN6_RC_CTL_RC6_ENABLE (1<<18)
|
|
|
|
#define GEN6_RC_CTL_RC1e_ENABLE (1<<20)
|
|
|
|
#define GEN6_RC_CTL_RC7_ENABLE (1<<22)
|
2013-11-15 17:32:12 +00:00
|
|
|
#define VLV_RC_CTL_CTX_RST_PARALLEL (1<<24)
|
2013-04-17 22:54:58 +00:00
|
|
|
#define GEN7_RC_CTL_TO_MODE (1<<28)
|
2010-12-08 18:40:43 +00:00
|
|
|
#define GEN6_RC_CTL_EI_MODE(x) ((x)<<27)
|
|
|
|
#define GEN6_RC_CTL_HW_ENABLE (1<<31)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN6_RP_DOWN_TIMEOUT _MMIO(0xA010)
|
|
|
|
#define GEN6_RP_INTERRUPT_LIMITS _MMIO(0xA014)
|
|
|
|
#define GEN6_RPSTAT1 _MMIO(0xA01C)
|
2011-01-18 23:49:25 +00:00
|
|
|
#define GEN6_CAGF_SHIFT 8
|
2013-01-29 20:00:15 +00:00
|
|
|
#define HSW_CAGF_SHIFT 7
|
2015-03-06 05:37:14 +00:00
|
|
|
#define GEN9_CAGF_SHIFT 23
|
2011-01-18 23:49:25 +00:00
|
|
|
#define GEN6_CAGF_MASK (0x7f << GEN6_CAGF_SHIFT)
|
2013-01-29 20:00:15 +00:00
|
|
|
#define HSW_CAGF_MASK (0x7f << HSW_CAGF_SHIFT)
|
2015-03-06 05:37:14 +00:00
|
|
|
#define GEN9_CAGF_MASK (0x1ff << GEN9_CAGF_SHIFT)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN6_RP_CONTROL _MMIO(0xA024)
|
2010-12-08 18:40:43 +00:00
|
|
|
#define GEN6_RP_MEDIA_TURBO (1<<11)
|
2011-12-13 03:21:59 +00:00
|
|
|
#define GEN6_RP_MEDIA_MODE_MASK (3<<9)
|
|
|
|
#define GEN6_RP_MEDIA_HW_TURBO_MODE (3<<9)
|
|
|
|
#define GEN6_RP_MEDIA_HW_NORMAL_MODE (2<<9)
|
|
|
|
#define GEN6_RP_MEDIA_HW_MODE (1<<9)
|
|
|
|
#define GEN6_RP_MEDIA_SW_MODE (0<<9)
|
2010-12-08 18:40:43 +00:00
|
|
|
#define GEN6_RP_MEDIA_IS_GFX (1<<8)
|
|
|
|
#define GEN6_RP_ENABLE (1<<7)
|
2011-01-18 23:49:25 +00:00
|
|
|
#define GEN6_RP_UP_IDLE_MIN (0x1<<3)
|
|
|
|
#define GEN6_RP_UP_BUSY_AVG (0x2<<3)
|
|
|
|
#define GEN6_RP_UP_BUSY_CONT (0x4<<3)
|
drm/i915: Tweak RPS thresholds to more aggressively downclock
After applying wait-boost we often find ourselves stuck at higher clocks
than required. The current threshold value requires the GPU to be
continuously and completely idle for 313ms before it is dropped by one
bin. Conversely, we require the GPU to be busy for an average of 90% over
a 84ms period before we upclock. So the current thresholds almost never
downclock the GPU, and respond very slowly to sudden demands for more
power. It is easy to observe that we currently lock into the wrong bin
and both underperform in benchmarks and consume more power than optimal
(just by repeating the task and measuring the different results).
An alternative approach, as discussed in the bspec, is to use a
continuous threshold for upclocking, and an average value for downclocking.
This is good for quickly detecting and reacting to state changes within a
frame, however it fails with the common throttling method of waiting
upon the outstanding frame - at least it is difficult to choose a
threshold that works well at 15,000fps and at 60fps. So continue to use
average busy/idle loads to determine frequency change.
v2: Use 3 power zones to keep frequencies low in steady-state mostly
idle (e.g. scrolling, interactive 2D drawing), and frequencies high
for demanding games. In between those end-states, we use a
fast-reclocking algorithm to converge more quickly on the desired bin.
v3: Bug fixes - make sure we reset adj after switching power zones.
v4: Tune - drop the continuous busy thresholds as it prevents us from
choosing the right frequency for glxgears style swap benchmarks. Instead
the goal is to be able to find the right clocks irrespective of the
wait-boost.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Kenneth Graunke <kenneth@whitecape.org>
Cc: Stéphane Marchesin <stephane.marchesin@gmail.com>
Cc: Owen Taylor <otaylor@redhat.com>
Cc: "Meng, Mengmeng" <mengmeng.meng@intel.com>
Cc: "Zhuang, Lena" <lena.zhuang@intel.com>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2013-09-25 16:34:57 +00:00
|
|
|
#define GEN6_RP_DOWN_IDLE_AVG (0x2<<0)
|
2011-01-18 23:49:25 +00:00
|
|
|
#define GEN6_RP_DOWN_IDLE_CONT (0x1<<0)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN6_RP_UP_THRESHOLD _MMIO(0xA02C)
|
|
|
|
#define GEN6_RP_DOWN_THRESHOLD _MMIO(0xA030)
|
|
|
|
#define GEN6_RP_CUR_UP_EI _MMIO(0xA050)
|
2011-01-18 23:49:25 +00:00
|
|
|
#define GEN6_CURICONT_MASK 0xffffff
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN6_RP_CUR_UP _MMIO(0xA054)
|
2011-01-18 23:49:25 +00:00
|
|
|
#define GEN6_CURBSYTAVG_MASK 0xffffff
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN6_RP_PREV_UP _MMIO(0xA058)
|
|
|
|
#define GEN6_RP_CUR_DOWN_EI _MMIO(0xA05C)
|
2011-01-18 23:49:25 +00:00
|
|
|
#define GEN6_CURIAVG_MASK 0xffffff
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN6_RP_CUR_DOWN _MMIO(0xA060)
|
|
|
|
#define GEN6_RP_PREV_DOWN _MMIO(0xA064)
|
|
|
|
#define GEN6_RP_UP_EI _MMIO(0xA068)
|
|
|
|
#define GEN6_RP_DOWN_EI _MMIO(0xA06C)
|
|
|
|
#define GEN6_RP_IDLE_HYSTERSIS _MMIO(0xA070)
|
|
|
|
#define GEN6_RPDEUHWTC _MMIO(0xA080)
|
|
|
|
#define GEN6_RPDEUC _MMIO(0xA084)
|
|
|
|
#define GEN6_RPDEUCSW _MMIO(0xA088)
|
|
|
|
#define GEN6_RC_STATE _MMIO(0xA094)
|
2016-02-05 18:43:29 +00:00
|
|
|
#define RC6_STATE (1 << 18)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN6_RC1_WAKE_RATE_LIMIT _MMIO(0xA098)
|
|
|
|
#define GEN6_RC6_WAKE_RATE_LIMIT _MMIO(0xA09C)
|
|
|
|
#define GEN6_RC6pp_WAKE_RATE_LIMIT _MMIO(0xA0A0)
|
|
|
|
#define GEN6_RC_EVALUATION_INTERVAL _MMIO(0xA0A8)
|
|
|
|
#define GEN6_RC_IDLE_HYSTERSIS _MMIO(0xA0AC)
|
|
|
|
#define GEN6_RC_SLEEP _MMIO(0xA0B0)
|
|
|
|
#define GEN6_RCUBMABDTMR _MMIO(0xA0B0)
|
|
|
|
#define GEN6_RC1e_THRESHOLD _MMIO(0xA0B4)
|
|
|
|
#define GEN6_RC6_THRESHOLD _MMIO(0xA0B8)
|
|
|
|
#define GEN6_RC6p_THRESHOLD _MMIO(0xA0BC)
|
|
|
|
#define VLV_RCEDATA _MMIO(0xA0BC)
|
|
|
|
#define GEN6_RC6pp_THRESHOLD _MMIO(0xA0C0)
|
|
|
|
#define GEN6_PMINTRMSK _MMIO(0xA168)
|
2016-05-31 08:28:27 +00:00
|
|
|
#define GEN8_PMINTR_REDIRECT_TO_NON_DISP (1<<31)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define VLV_PWRDWNUPCTL _MMIO(0xA294)
|
|
|
|
#define GEN9_MEDIA_PG_IDLE_HYSTERESIS _MMIO(0xA0C4)
|
|
|
|
#define GEN9_RENDER_PG_IDLE_HYSTERESIS _MMIO(0xA0C8)
|
|
|
|
#define GEN9_PG_ENABLE _MMIO(0xA210)
|
2015-04-10 08:41:29 +00:00
|
|
|
#define GEN9_RENDER_PG_ENABLE (1<<0)
|
|
|
|
#define GEN9_MEDIA_PG_ENABLE (1<<1)
|
2010-12-08 18:40:43 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define VLV_CHICKEN_3 _MMIO(VLV_DISPLAY_BASE + 0x7040C)
|
2014-12-05 08:43:41 +00:00
|
|
|
#define PIXEL_OVERLAP_CNT_MASK (3 << 30)
|
|
|
|
#define PIXEL_OVERLAP_CNT_SHIFT 30
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN6_PMISR _MMIO(0x44020)
|
|
|
|
#define GEN6_PMIMR _MMIO(0x44024) /* rps_lock */
|
|
|
|
#define GEN6_PMIIR _MMIO(0x44028)
|
|
|
|
#define GEN6_PMIER _MMIO(0x4402C)
|
2010-12-08 18:40:43 +00:00
|
|
|
#define GEN6_PM_MBOX_EVENT (1<<25)
|
|
|
|
#define GEN6_PM_THERMAL_EVENT (1<<24)
|
|
|
|
#define GEN6_PM_RP_DOWN_TIMEOUT (1<<6)
|
|
|
|
#define GEN6_PM_RP_UP_THRESHOLD (1<<5)
|
|
|
|
#define GEN6_PM_RP_DOWN_THRESHOLD (1<<4)
|
|
|
|
#define GEN6_PM_RP_UP_EI_EXPIRED (1<<2)
|
|
|
|
#define GEN6_PM_RP_DOWN_EI_EXPIRED (1<<1)
|
2013-05-29 02:22:27 +00:00
|
|
|
#define GEN6_PM_RPS_EVENTS (GEN6_PM_RP_UP_THRESHOLD | \
|
2011-04-25 18:25:20 +00:00
|
|
|
GEN6_PM_RP_DOWN_THRESHOLD | \
|
|
|
|
GEN6_PM_RP_DOWN_TIMEOUT)
|
2010-12-08 18:40:43 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN7_GT_SCRATCH(i) _MMIO(0x4F100 + (i) * 4)
|
2014-05-05 12:13:55 +00:00
|
|
|
#define GEN7_GT_SCRATCH_REG_NUM 8
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define VLV_GTLC_SURVIVABILITY_REG _MMIO(0x130098)
|
2014-01-30 17:38:16 +00:00
|
|
|
#define VLV_GFX_CLK_STATUS_BIT (1<<3)
|
|
|
|
#define VLV_GFX_CLK_FORCE_ON_BIT (1<<2)
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN6_GT_GFX_RC6_LOCKED _MMIO(0x138104)
|
|
|
|
#define VLV_COUNTER_CONTROL _MMIO(0x138104)
|
2013-09-27 00:55:57 +00:00
|
|
|
#define VLV_COUNT_RANGE_HIGH (1<<15)
|
2014-07-03 21:33:01 +00:00
|
|
|
#define VLV_MEDIA_RC0_COUNT_EN (1<<5)
|
|
|
|
#define VLV_RENDER_RC0_COUNT_EN (1<<4)
|
2013-09-27 00:55:57 +00:00
|
|
|
#define VLV_MEDIA_RC6_COUNT_EN (1<<1)
|
|
|
|
#define VLV_RENDER_RC6_COUNT_EN (1<<0)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN6_GT_GFX_RC6 _MMIO(0x138108)
|
|
|
|
#define VLV_GT_RENDER_RC6 _MMIO(0x138108)
|
|
|
|
#define VLV_GT_MEDIA_RC6 _MMIO(0x13810C)
|
2014-04-14 17:24:24 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN6_GT_GFX_RC6p _MMIO(0x13810C)
|
|
|
|
#define GEN6_GT_GFX_RC6pp _MMIO(0x138110)
|
|
|
|
#define VLV_RENDER_C0_COUNT _MMIO(0x138118)
|
|
|
|
#define VLV_MEDIA_C0_COUNT _MMIO(0x13811C)
|
2012-03-28 01:59:38 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN6_PCODE_MAILBOX _MMIO(0x138124)
|
2010-12-08 18:40:43 +00:00
|
|
|
#define GEN6_PCODE_READY (1<<31)
|
2012-09-26 17:34:01 +00:00
|
|
|
#define GEN6_PCODE_WRITE_RC6VIDS 0x4
|
|
|
|
#define GEN6_PCODE_READ_RC6VIDS 0x5
|
2015-04-30 15:39:18 +00:00
|
|
|
#define GEN6_ENCODE_RC6_VID(mv) (((mv) - 245) / 5)
|
|
|
|
#define GEN6_DECODE_RC6_VID(vids) (((vids) * 5) + 245)
|
2015-06-03 12:45:13 +00:00
|
|
|
#define BDW_PCODE_DISPLAY_FREQ_CHANGE_REQ 0x18
|
2015-04-30 15:39:19 +00:00
|
|
|
#define GEN9_PCODE_READ_MEM_LATENCY 0x6
|
|
|
|
#define GEN9_MEM_LATENCY_LEVEL_MASK 0xFF
|
|
|
|
#define GEN9_MEM_LATENCY_LEVEL_1_5_SHIFT 8
|
|
|
|
#define GEN9_MEM_LATENCY_LEVEL_2_6_SHIFT 16
|
|
|
|
#define GEN9_MEM_LATENCY_LEVEL_3_7_SHIFT 24
|
drm/i915/skl: Deinit/init the display at suspend/resume
We need to re-init the display hardware when going out of suspend. This
includes:
- Hooking the PCH to the reset logic
- Restoring CDCDLK
- Enabling the DDB power
Among those, only the CDCDLK one is a bit tricky. There's some
complexity in that:
- DPLL0 (which is the source for CDCLK) has two VCOs, each with a set
of supported frequencies. As eDP also uses DPLL0 for its link rate,
once DPLL0 is on, we restrict the possible eDP link rates the chosen
VCO.
- CDCLK also limits the bandwidth available to push pixels.
So, as a first step, this commit restore what the BIOS set, until I can
do more testing.
In case that's of interest for the reviewer, I've unit tested the
function that derives the decimal frequency field:
#include <stdio.h>
#include <stdint.h>
#include <assert.h>
#define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x)))
static const struct dpll_freq {
unsigned int freq;
unsigned int decimal;
} freqs[] = {
{ .freq = 308570, .decimal = 0b01001100111},
{ .freq = 337500, .decimal = 0b01010100001},
{ .freq = 432000, .decimal = 0b01101011110},
{ .freq = 450000, .decimal = 0b01110000010},
{ .freq = 540000, .decimal = 0b10000110110},
{ .freq = 617140, .decimal = 0b10011010000},
{ .freq = 675000, .decimal = 0b10101000100},
};
static void intbits(unsigned int v)
{
int i;
for(i = 10; i >= 0; i--)
putchar('0' + ((v >> i) & 1));
}
static unsigned int freq_decimal(unsigned int freq /* in kHz */)
{
return (freq - 1000) / 500;
}
static void test_freq(const struct dpll_freq *entry)
{
unsigned int decimal = freq_decimal(entry->freq);
printf("freq: %d, expected: ", entry->freq);
intbits(entry->decimal);
printf(", got: ");
intbits(decimal);
putchar('\n');
assert(decimal == entry->decimal);
}
int main(int argc, char **argv)
{
int i;
for (i = 0; i < ARRAY_SIZE(freqs); i++)
test_freq(&freqs[i]);
return 0;
}
v2:
- Rebase on top of -nightly
- Use (freq - 1000) / 500 for the decimal frequency (Ville)
- Fix setting the enable bit of HSW_NDE_RSTWRN_OPT (Ville)
- Rename skl_display_{resume,suspend} to skl_{init,uninit}_cdclk to
be consistent with the BXT code (Ville)
- Store boot CDCLK in ddi_pll_init (Ville)
- Merge dev_priv's skl_boot_cdclk into cdclk_freq
- Use LCPLL_PLL_LOCK instead of (1 << 30) (Ville)
- Replace various '0' by SKL_DPLL0 to be a bit more explicit that
we're programming DPLL0
- Busy poll the PCU before doing the frequency change. It takes about
3/4 cycles, each separated by 10us, to get the ACK from the CPU
(Ville)
v3:
- Restore dev_priv->skl_boot_cdclk, leaving unification with
dev_priv->cdclk_freq for a later patch (Daniel, Ville)
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2015-05-21 15:37:48 +00:00
|
|
|
#define SKL_PCODE_CDCLK_CONTROL 0x7
|
|
|
|
#define SKL_CDCLK_PREPARE_FOR_CHANGE 0x3
|
|
|
|
#define SKL_CDCLK_READY_FOR_CHANGE 0x1
|
2015-04-30 15:39:18 +00:00
|
|
|
#define GEN6_PCODE_WRITE_MIN_FREQ_TABLE 0x8
|
|
|
|
#define GEN6_PCODE_READ_MIN_FREQ_TABLE 0x9
|
|
|
|
#define GEN6_READ_OC_PARAMS 0xc
|
2013-09-10 22:36:37 +00:00
|
|
|
#define GEN6_PCODE_READ_D_COMP 0x10
|
|
|
|
#define GEN6_PCODE_WRITE_D_COMP 0x11
|
2014-11-24 08:07:39 +00:00
|
|
|
#define HSW_PCODE_DE_WRITE_FREQ_REQ 0x17
|
2013-11-03 04:07:47 +00:00
|
|
|
#define DISPLAY_IPS_CONTROL 0x19
|
2014-11-19 22:21:52 +00:00
|
|
|
#define HSW_PCODE_DYNAMIC_DUTY_CYCLE_CONTROL 0x1A
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN6_PCODE_DATA _MMIO(0x138128)
|
2011-06-28 20:04:16 +00:00
|
|
|
#define GEN6_PCODE_FREQ_IA_RATIO_SHIFT 8
|
2013-04-12 18:10:13 +00:00
|
|
|
#define GEN6_PCODE_FREQ_RING_RATIO_SHIFT 16
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN6_PCODE_DATA1 _MMIO(0x13812C)
|
2010-12-08 18:40:43 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN6_GT_CORE_STATUS _MMIO(0x138060)
|
2011-12-13 03:34:16 +00:00
|
|
|
#define GEN6_CORE_CPD_STATE_MASK (7<<4)
|
|
|
|
#define GEN6_RCn_MASK 7
|
|
|
|
#define GEN6_RC0 0
|
|
|
|
#define GEN6_RC3 2
|
|
|
|
#define GEN6_RC6 3
|
|
|
|
#define GEN6_RC7 4
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN8_GT_SLICE_INFO _MMIO(0x138064)
|
2015-09-25 09:54:58 +00:00
|
|
|
#define GEN8_LSLICESTAT_MASK 0x7
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define CHV_POWER_SS0_SIG1 _MMIO(0xa720)
|
|
|
|
#define CHV_POWER_SS1_SIG1 _MMIO(0xa728)
|
2015-02-27 18:22:32 +00:00
|
|
|
#define CHV_SS_PG_ENABLE (1<<1)
|
|
|
|
#define CHV_EU08_PG_ENABLE (1<<9)
|
|
|
|
#define CHV_EU19_PG_ENABLE (1<<17)
|
|
|
|
#define CHV_EU210_PG_ENABLE (1<<25)
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define CHV_POWER_SS0_SIG2 _MMIO(0xa724)
|
|
|
|
#define CHV_POWER_SS1_SIG2 _MMIO(0xa72c)
|
2015-02-27 18:22:32 +00:00
|
|
|
#define CHV_EU311_PG_ENABLE (1<<1)
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN9_SLICE_PGCTL_ACK(slice) _MMIO(0x804c + (slice)*0x4)
|
2015-02-13 16:27:55 +00:00
|
|
|
#define GEN9_PGCTL_SLICE_ACK (1 << 0)
|
2015-04-04 01:13:18 +00:00
|
|
|
#define GEN9_PGCTL_SS_ACK(subslice) (1 << (2 + (subslice)*2))
|
2015-02-13 16:27:55 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN9_SS01_EU_PGCTL_ACK(slice) _MMIO(0x805c + (slice)*0x8)
|
|
|
|
#define GEN9_SS23_EU_PGCTL_ACK(slice) _MMIO(0x8060 + (slice)*0x8)
|
2015-02-13 16:27:55 +00:00
|
|
|
#define GEN9_PGCTL_SSA_EU08_ACK (1 << 0)
|
|
|
|
#define GEN9_PGCTL_SSA_EU19_ACK (1 << 2)
|
|
|
|
#define GEN9_PGCTL_SSA_EU210_ACK (1 << 4)
|
|
|
|
#define GEN9_PGCTL_SSA_EU311_ACK (1 << 6)
|
|
|
|
#define GEN9_PGCTL_SSB_EU08_ACK (1 << 8)
|
|
|
|
#define GEN9_PGCTL_SSB_EU19_ACK (1 << 10)
|
|
|
|
#define GEN9_PGCTL_SSB_EU210_ACK (1 << 12)
|
|
|
|
#define GEN9_PGCTL_SSB_EU311_ACK (1 << 14)
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN7_MISCCPCTL _MMIO(0x9424)
|
2015-08-12 14:43:36 +00:00
|
|
|
#define GEN7_DOP_CLOCK_GATE_ENABLE (1<<0)
|
|
|
|
#define GEN8_DOP_CLOCK_GATE_CFCLK_ENABLE (1<<2)
|
|
|
|
#define GEN8_DOP_CLOCK_GATE_GUC_ENABLE (1<<4)
|
2015-09-08 09:31:49 +00:00
|
|
|
#define GEN8_DOP_CLOCK_GATE_MEDIA_ENABLE (1<<6)
|
2012-05-25 23:56:22 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN8_GARBCNTL _MMIO(0xB004)
|
2015-08-03 19:24:56 +00:00
|
|
|
#define GEN9_GAPS_TSV_CREDIT_DISABLE (1<<7)
|
|
|
|
|
2012-05-25 23:56:22 +00:00
|
|
|
/* IVYBRIDGE DPF */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN7_L3CDERRST1(slice) _MMIO(0xB008 + (slice) * 0x200) /* L3CD Error Status 1 */
|
2012-05-25 23:56:22 +00:00
|
|
|
#define GEN7_L3CDERRST1_ROW_MASK (0x7ff<<14)
|
|
|
|
#define GEN7_PARITY_ERROR_VALID (1<<13)
|
|
|
|
#define GEN7_L3CDERRST1_BANK_MASK (3<<11)
|
|
|
|
#define GEN7_L3CDERRST1_SUBBANK_MASK (7<<8)
|
|
|
|
#define GEN7_PARITY_ERROR_ROW(reg) \
|
|
|
|
((reg & GEN7_L3CDERRST1_ROW_MASK) >> 14)
|
|
|
|
#define GEN7_PARITY_ERROR_BANK(reg) \
|
|
|
|
((reg & GEN7_L3CDERRST1_BANK_MASK) >> 11)
|
|
|
|
#define GEN7_PARITY_ERROR_SUBBANK(reg) \
|
|
|
|
((reg & GEN7_L3CDERRST1_SUBBANK_MASK) >> 8)
|
|
|
|
#define GEN7_L3CDERRST1_ENABLE (1<<7)
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN7_L3LOG(slice, i) _MMIO(0xB070 + (slice) * 0x200 + (i) * 4)
|
2012-05-25 23:56:24 +00:00
|
|
|
#define GEN7_L3LOG_SIZE 0x80
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN7_HALF_SLICE_CHICKEN1 _MMIO(0xe100) /* IVB GT1 + VLV */
|
|
|
|
#define GEN7_HALF_SLICE_CHICKEN1_GT2 _MMIO(0xf100)
|
2012-10-25 19:15:45 +00:00
|
|
|
#define GEN7_MAX_PS_THREAD_DEP (8<<12)
|
2013-11-03 04:08:00 +00:00
|
|
|
#define GEN7_SINGLE_SUBSCAN_DISPATCH_ENABLE (1<<10)
|
2015-04-10 12:12:25 +00:00
|
|
|
#define GEN7_SBE_SS_CACHE_DISPATCH_PORT_SHARING_DISABLE (1<<4)
|
2012-10-25 19:15:45 +00:00
|
|
|
#define GEN7_PSD_SINGLE_PORT_DISPATCH_ENABLE (1<<3)
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN9_HALF_SLICE_CHICKEN5 _MMIO(0xe188)
|
2014-03-26 18:18:01 +00:00
|
|
|
#define GEN9_DG_MIRROR_FIX_ENABLE (1<<5)
|
2015-02-09 19:33:21 +00:00
|
|
|
#define GEN9_CCS_TLB_PREFETCH_ENABLE (1<<3)
|
2014-03-26 18:18:01 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN8_ROW_CHICKEN _MMIO(0xe4f0)
|
2016-03-16 16:13:46 +00:00
|
|
|
#define FLOW_CONTROL_ENABLE (1<<15)
|
2014-02-27 07:59:30 +00:00
|
|
|
#define PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE (1<<8)
|
2014-02-27 07:59:31 +00:00
|
|
|
#define STALL_DOP_GATING_DISABLE (1<<5)
|
2014-02-27 07:59:30 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN7_ROW_CHICKEN2 _MMIO(0xe4f4)
|
|
|
|
#define GEN7_ROW_CHICKEN2_GT2 _MMIO(0xf4f4)
|
2012-10-25 19:15:42 +00:00
|
|
|
#define DOP_CLOCK_GATING_DISABLE (1<<0)
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define HSW_ROW_CHICKEN3 _MMIO(0xe49c)
|
2013-10-02 22:53:16 +00:00
|
|
|
#define HSW_ROW_CHICKEN3_L3_GLOBAL_ATOMICS_DISABLE (1 << 6)
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define HALF_SLICE_CHICKEN2 _MMIO(0xe180)
|
2015-09-08 09:31:52 +00:00
|
|
|
#define GEN8_ST_PO_DISABLE (1<<13)
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define HALF_SLICE_CHICKEN3 _MMIO(0xe184)
|
drm/i915: Make sample_c messages go faster on Haswell.
Haswell significantly improved the performance of sampler_c messages,
but the optimization appears to be off by default. Later platforms
remove this bit, and apparently always enable the optimization.
Improves performance in "Counter Strike: Global Offensive" by 18%
at default settings on Iris Pro.
This may break sampling of paletted formats (P8/A8P8/P8A8). It's
unclear whether it affects sampling of paletted formats in general,
or just the sample_c message (which is never used).
While libva does have support for using paletted formats (primarily
for OSDs), that support appears to have been broken for at least a
year, so I couldn't observe a regression from this:
I tried to get libva-intel to use paletted formats, and observe a
regression...but the only thing I found that used it was mplayer's OSD
(on screen display). Even without my patch, the colors were totally
wrong with that, and it's according to a few distro wikis, that's been
the case for over a year.
If libva's code for paletted formats /is/ broken, they could always
add code to disable this bit using the command validator when fixing
it.
Further investigation from Haihao shows that libva mplayer OSD seems
to work at least on his setup (still unclear what's wron with Ken's),
and that it's not affected by this patch. Quoting the discussion
between Haihao and Ken:
> > > If you use "-vo gl" or "-vo xv", the OSD is solid white text with a black
> > > border around it. I presume that it's supposed to be white with vaapi as
> > > well, but I guess I'm not entirely sure.
> > >
> > > It's possible that the optimization doesn't affect the palette as long as
> > > you never use sample_c with the paletted textures.
> >
> > I verified the palette takes effect in the following way:
> >
> > 1. Only support P8A8 format in the driver
> >
> > 2. ran the above command and I saw white OSD text
> >
> > 3. Only support P4A4 format in the driver and don't use
> > 3DSTATE_SAMPLER_PALETTE_LOAD0 to load the value to the texture palette,
> > so the palette keeps unchanged.
> >
> > 4. ran the above command and I saw black OSD text.
> >
> > 5. Load the right value to the texture palette and ran the above command
> > again, I saw white OSD text.
> >
> > Hence I think sample_c with the paletted textures is used in the driver.
>
> That sounds like the palette is actually working, then. Great :)
>
> I doubt that libva would use sample_c - sampling with a shadow comparison?
> It looks like it just uses sample and sample+killpix.
You are right, libva driver doesn't use sample_c message.
> I'm pretty sure the sample_c optimization just uses the palette memory as
> storage for some stuff, so it's quite possible it just works if you're
> only using sample and sample+killpix.
Thanks for the explanation, it makes sense to me.
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
[danvet: Add wa name from Ville's review to the comment and copypaste
the explanation why we don't care about libva (already broken) from
Ken. Also add conclusion from libva devs that&why this is all fine.]
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: "Xiang, Haihao" <haihao.xiang@intel.com>
Cc: libva@lists.freedesktop.org
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2015-01-01 00:23:00 +00:00
|
|
|
#define HSW_SAMPLE_C_PERFORMANCE (1<<9)
|
2013-11-05 06:52:39 +00:00
|
|
|
#define GEN8_CENTROID_PIXEL_OPT_DIS (1<<8)
|
2015-02-05 10:47:20 +00:00
|
|
|
#define GEN9_DISABLE_OCL_OOB_SUPPRESS_LOGIC (1<<5)
|
2013-11-03 04:07:57 +00:00
|
|
|
#define GEN8_SAMPLER_POWER_BYPASS_DIS (1<<1)
|
2013-11-05 06:52:39 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN9_HALF_SLICE_CHICKEN7 _MMIO(0xe194)
|
2015-02-05 10:47:22 +00:00
|
|
|
#define GEN9_ENABLE_YV12_BUGFIX (1<<4)
|
2016-04-19 14:45:52 +00:00
|
|
|
#define GEN9_ENABLE_GPGPU_PREEMPTION (1<<2)
|
2015-02-05 10:47:22 +00:00
|
|
|
|
2014-10-27 14:26:52 +00:00
|
|
|
/* Audio */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define G4X_AUD_VID_DID _MMIO(dev_priv->info.display_mmio_offset + 0x62020)
|
2014-10-27 14:26:52 +00:00
|
|
|
#define INTEL_AUDIO_DEVCL 0x808629FB
|
|
|
|
#define INTEL_AUDIO_DEVBLC 0x80862801
|
|
|
|
#define INTEL_AUDIO_DEVCTG 0x80862802
|
drm/i915: pass ELD to HDMI/DP audio driver
Add ELD support for Intel Eaglelake, IbexPeak/Ironlake,
SandyBridge/CougarPoint and IvyBridge/PantherPoint chips.
ELD (EDID-Like Data) describes to the HDMI/DP audio driver the audio
capabilities of the plugged monitor. It's built and passed to audio
driver in 2 steps:
(1) at get_modes time, parse EDID and save ELD to drm_connector.eld[]
(2) at mode_set time, write drm_connector.eld[] to the Transcoder's hw
ELD buffer and set the ELD_valid bit to inform HDMI/DP audio driver
This patch is tested OK on G45/HDMI, IbexPeak/HDMI and IvyBridge/HDMI+DP.
Test scheme: plug in the HDMI/DP monitor, and run
cat /proc/asound/card0/eld*
to check if the monitor name, HDMI/DP type, etc. show up correctly.
Minor imperfection: the GEN5_AUD_CNTL_ST/DIP_Port_Select field always
reads 0 (reserved). Without knowing the port number, I worked it around
by setting the ELD_valid bit for ALL the three ports. It's tested to not
be a problem, because the audio driver will find invalid ELD data and
hence rightfully abort, even when it sees the ELD_valid indicator.
Thanks to Zhenyu and Pierre-Louis for a lot of valuable help and testing.
CC: Zhao Yakui <yakui.zhao@intel.com>
CC: Wang Zhenyu <zhenyu.z.wang@intel.com>
CC: Jeremy Bush <contractfrombelow@gmail.com>
CC: Christopher White <c.white@pulseforce.com>
CC: Pierre-Louis Bossart <pierre-louis.bossart@intel.com>
CC: Paul Menzel <paulepanter@users.sourceforge.net>
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
2011-09-05 06:25:34 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define G4X_AUD_CNTL_ST _MMIO(0x620B4)
|
2014-10-27 14:26:52 +00:00
|
|
|
#define G4X_ELDV_DEVCL_DEVBLC (1 << 13)
|
|
|
|
#define G4X_ELDV_DEVCTG (1 << 14)
|
|
|
|
#define G4X_ELD_ADDR_MASK (0xf << 5)
|
|
|
|
#define G4X_ELD_ACK (1 << 4)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define G4X_HDMIW_HDMIEDID _MMIO(0x6210C)
|
drm/i915: pass ELD to HDMI/DP audio driver
Add ELD support for Intel Eaglelake, IbexPeak/Ironlake,
SandyBridge/CougarPoint and IvyBridge/PantherPoint chips.
ELD (EDID-Like Data) describes to the HDMI/DP audio driver the audio
capabilities of the plugged monitor. It's built and passed to audio
driver in 2 steps:
(1) at get_modes time, parse EDID and save ELD to drm_connector.eld[]
(2) at mode_set time, write drm_connector.eld[] to the Transcoder's hw
ELD buffer and set the ELD_valid bit to inform HDMI/DP audio driver
This patch is tested OK on G45/HDMI, IbexPeak/HDMI and IvyBridge/HDMI+DP.
Test scheme: plug in the HDMI/DP monitor, and run
cat /proc/asound/card0/eld*
to check if the monitor name, HDMI/DP type, etc. show up correctly.
Minor imperfection: the GEN5_AUD_CNTL_ST/DIP_Port_Select field always
reads 0 (reserved). Without knowing the port number, I worked it around
by setting the ELD_valid bit for ALL the three ports. It's tested to not
be a problem, because the audio driver will find invalid ELD data and
hence rightfully abort, even when it sees the ELD_valid indicator.
Thanks to Zhenyu and Pierre-Louis for a lot of valuable help and testing.
CC: Zhao Yakui <yakui.zhao@intel.com>
CC: Wang Zhenyu <zhenyu.z.wang@intel.com>
CC: Jeremy Bush <contractfrombelow@gmail.com>
CC: Christopher White <c.white@pulseforce.com>
CC: Pierre-Louis Bossart <pierre-louis.bossart@intel.com>
CC: Paul Menzel <paulepanter@users.sourceforge.net>
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
2011-09-05 06:25:34 +00:00
|
|
|
|
2014-10-27 14:26:52 +00:00
|
|
|
#define _IBX_HDMIW_HDMIEDID_A 0xE2050
|
|
|
|
#define _IBX_HDMIW_HDMIEDID_B 0xE2150
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define IBX_HDMIW_HDMIEDID(pipe) _MMIO_PIPE(pipe, _IBX_HDMIW_HDMIEDID_A, \
|
|
|
|
_IBX_HDMIW_HDMIEDID_B)
|
2014-10-27 14:26:52 +00:00
|
|
|
#define _IBX_AUD_CNTL_ST_A 0xE20B4
|
|
|
|
#define _IBX_AUD_CNTL_ST_B 0xE21B4
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define IBX_AUD_CNTL_ST(pipe) _MMIO_PIPE(pipe, _IBX_AUD_CNTL_ST_A, \
|
|
|
|
_IBX_AUD_CNTL_ST_B)
|
2014-10-27 14:26:52 +00:00
|
|
|
#define IBX_ELD_BUFFER_SIZE_MASK (0x1f << 10)
|
|
|
|
#define IBX_ELD_ADDRESS_MASK (0x1f << 5)
|
|
|
|
#define IBX_ELD_ACK (1 << 4)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define IBX_AUD_CNTL_ST2 _MMIO(0xE20C0)
|
2014-10-27 14:26:59 +00:00
|
|
|
#define IBX_CP_READY(port) ((1 << 1) << (((port) - 1) * 4))
|
|
|
|
#define IBX_ELD_VALID(port) ((1 << 0) << (((port) - 1) * 4))
|
2011-12-09 12:42:18 +00:00
|
|
|
|
2014-10-27 14:26:52 +00:00
|
|
|
#define _CPT_HDMIW_HDMIEDID_A 0xE5050
|
|
|
|
#define _CPT_HDMIW_HDMIEDID_B 0xE5150
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define CPT_HDMIW_HDMIEDID(pipe) _MMIO_PIPE(pipe, _CPT_HDMIW_HDMIEDID_A, _CPT_HDMIW_HDMIEDID_B)
|
2014-10-27 14:26:52 +00:00
|
|
|
#define _CPT_AUD_CNTL_ST_A 0xE50B4
|
|
|
|
#define _CPT_AUD_CNTL_ST_B 0xE51B4
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define CPT_AUD_CNTL_ST(pipe) _MMIO_PIPE(pipe, _CPT_AUD_CNTL_ST_A, _CPT_AUD_CNTL_ST_B)
|
|
|
|
#define CPT_AUD_CNTRL_ST2 _MMIO(0xE50C0)
|
drm/i915: pass ELD to HDMI/DP audio driver
Add ELD support for Intel Eaglelake, IbexPeak/Ironlake,
SandyBridge/CougarPoint and IvyBridge/PantherPoint chips.
ELD (EDID-Like Data) describes to the HDMI/DP audio driver the audio
capabilities of the plugged monitor. It's built and passed to audio
driver in 2 steps:
(1) at get_modes time, parse EDID and save ELD to drm_connector.eld[]
(2) at mode_set time, write drm_connector.eld[] to the Transcoder's hw
ELD buffer and set the ELD_valid bit to inform HDMI/DP audio driver
This patch is tested OK on G45/HDMI, IbexPeak/HDMI and IvyBridge/HDMI+DP.
Test scheme: plug in the HDMI/DP monitor, and run
cat /proc/asound/card0/eld*
to check if the monitor name, HDMI/DP type, etc. show up correctly.
Minor imperfection: the GEN5_AUD_CNTL_ST/DIP_Port_Select field always
reads 0 (reserved). Without knowing the port number, I worked it around
by setting the ELD_valid bit for ALL the three ports. It's tested to not
be a problem, because the audio driver will find invalid ELD data and
hence rightfully abort, even when it sees the ELD_valid indicator.
Thanks to Zhenyu and Pierre-Louis for a lot of valuable help and testing.
CC: Zhao Yakui <yakui.zhao@intel.com>
CC: Wang Zhenyu <zhenyu.z.wang@intel.com>
CC: Jeremy Bush <contractfrombelow@gmail.com>
CC: Christopher White <c.white@pulseforce.com>
CC: Pierre-Louis Bossart <pierre-louis.bossart@intel.com>
CC: Paul Menzel <paulepanter@users.sourceforge.net>
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
2011-09-05 06:25:34 +00:00
|
|
|
|
2014-10-27 14:26:52 +00:00
|
|
|
#define _VLV_HDMIW_HDMIEDID_A (VLV_DISPLAY_BASE + 0x62050)
|
|
|
|
#define _VLV_HDMIW_HDMIEDID_B (VLV_DISPLAY_BASE + 0x62150)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define VLV_HDMIW_HDMIEDID(pipe) _MMIO_PIPE(pipe, _VLV_HDMIW_HDMIEDID_A, _VLV_HDMIW_HDMIEDID_B)
|
2014-10-27 14:26:52 +00:00
|
|
|
#define _VLV_AUD_CNTL_ST_A (VLV_DISPLAY_BASE + 0x620B4)
|
|
|
|
#define _VLV_AUD_CNTL_ST_B (VLV_DISPLAY_BASE + 0x621B4)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define VLV_AUD_CNTL_ST(pipe) _MMIO_PIPE(pipe, _VLV_AUD_CNTL_ST_A, _VLV_AUD_CNTL_ST_B)
|
|
|
|
#define VLV_AUD_CNTL_ST2 _MMIO(VLV_DISPLAY_BASE + 0x620C0)
|
2013-11-01 04:17:03 +00:00
|
|
|
|
2012-01-03 17:23:29 +00:00
|
|
|
/* These are the 4 32-bit write offset registers for each stream
|
|
|
|
* output buffer. It determines the offset from the
|
|
|
|
* 3DSTATE_SO_BUFFERs that the next streamed vertex output goes to.
|
|
|
|
*/
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN7_SO_WRITE_OFFSET(n) _MMIO(0x5280 + (n) * 4)
|
2012-01-03 17:23:29 +00:00
|
|
|
|
2014-10-27 14:26:52 +00:00
|
|
|
#define _IBX_AUD_CONFIG_A 0xe2000
|
|
|
|
#define _IBX_AUD_CONFIG_B 0xe2100
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define IBX_AUD_CFG(pipe) _MMIO_PIPE(pipe, _IBX_AUD_CONFIG_A, _IBX_AUD_CONFIG_B)
|
2014-10-27 14:26:52 +00:00
|
|
|
#define _CPT_AUD_CONFIG_A 0xe5000
|
|
|
|
#define _CPT_AUD_CONFIG_B 0xe5100
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define CPT_AUD_CFG(pipe) _MMIO_PIPE(pipe, _CPT_AUD_CONFIG_A, _CPT_AUD_CONFIG_B)
|
2014-10-27 14:26:52 +00:00
|
|
|
#define _VLV_AUD_CONFIG_A (VLV_DISPLAY_BASE + 0x62000)
|
|
|
|
#define _VLV_AUD_CONFIG_B (VLV_DISPLAY_BASE + 0x62100)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define VLV_AUD_CFG(pipe) _MMIO_PIPE(pipe, _VLV_AUD_CONFIG_A, _VLV_AUD_CONFIG_B)
|
2013-11-01 04:17:03 +00:00
|
|
|
|
2012-01-06 20:41:31 +00:00
|
|
|
#define AUD_CONFIG_N_VALUE_INDEX (1 << 29)
|
|
|
|
#define AUD_CONFIG_N_PROG_ENABLE (1 << 28)
|
|
|
|
#define AUD_CONFIG_UPPER_N_SHIFT 20
|
2014-10-27 14:26:52 +00:00
|
|
|
#define AUD_CONFIG_UPPER_N_MASK (0xff << 20)
|
2012-01-06 20:41:31 +00:00
|
|
|
#define AUD_CONFIG_LOWER_N_SHIFT 4
|
2014-10-27 14:26:52 +00:00
|
|
|
#define AUD_CONFIG_LOWER_N_MASK (0xfff << 4)
|
2012-01-06 20:41:31 +00:00
|
|
|
#define AUD_CONFIG_PIXEL_CLOCK_HDMI_SHIFT 16
|
2013-10-16 09:34:48 +00:00
|
|
|
#define AUD_CONFIG_PIXEL_CLOCK_HDMI_MASK (0xf << 16)
|
|
|
|
#define AUD_CONFIG_PIXEL_CLOCK_HDMI_25175 (0 << 16)
|
|
|
|
#define AUD_CONFIG_PIXEL_CLOCK_HDMI_25200 (1 << 16)
|
|
|
|
#define AUD_CONFIG_PIXEL_CLOCK_HDMI_27000 (2 << 16)
|
|
|
|
#define AUD_CONFIG_PIXEL_CLOCK_HDMI_27027 (3 << 16)
|
|
|
|
#define AUD_CONFIG_PIXEL_CLOCK_HDMI_54000 (4 << 16)
|
|
|
|
#define AUD_CONFIG_PIXEL_CLOCK_HDMI_54054 (5 << 16)
|
|
|
|
#define AUD_CONFIG_PIXEL_CLOCK_HDMI_74176 (6 << 16)
|
|
|
|
#define AUD_CONFIG_PIXEL_CLOCK_HDMI_74250 (7 << 16)
|
|
|
|
#define AUD_CONFIG_PIXEL_CLOCK_HDMI_148352 (8 << 16)
|
|
|
|
#define AUD_CONFIG_PIXEL_CLOCK_HDMI_148500 (9 << 16)
|
2012-01-06 20:41:31 +00:00
|
|
|
#define AUD_CONFIG_DISABLE_NCTS (1 << 3)
|
|
|
|
|
2012-08-09 08:52:15 +00:00
|
|
|
/* HSW Audio */
|
2014-10-27 14:26:52 +00:00
|
|
|
#define _HSW_AUD_CONFIG_A 0x65000
|
|
|
|
#define _HSW_AUD_CONFIG_B 0x65100
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define HSW_AUD_CFG(pipe) _MMIO_PIPE(pipe, _HSW_AUD_CONFIG_A, _HSW_AUD_CONFIG_B)
|
2014-10-27 14:26:52 +00:00
|
|
|
|
|
|
|
#define _HSW_AUD_MISC_CTRL_A 0x65010
|
|
|
|
#define _HSW_AUD_MISC_CTRL_B 0x65110
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define HSW_AUD_MISC_CTRL(pipe) _MMIO_PIPE(pipe, _HSW_AUD_MISC_CTRL_A, _HSW_AUD_MISC_CTRL_B)
|
2014-10-27 14:26:52 +00:00
|
|
|
|
|
|
|
#define _HSW_AUD_DIP_ELD_CTRL_ST_A 0x650b4
|
|
|
|
#define _HSW_AUD_DIP_ELD_CTRL_ST_B 0x651b4
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define HSW_AUD_DIP_ELD_CTRL(pipe) _MMIO_PIPE(pipe, _HSW_AUD_DIP_ELD_CTRL_ST_A, _HSW_AUD_DIP_ELD_CTRL_ST_B)
|
2012-08-09 08:52:15 +00:00
|
|
|
|
|
|
|
/* Audio Digital Converter */
|
2014-10-27 14:26:52 +00:00
|
|
|
#define _HSW_AUD_DIG_CNVT_1 0x65080
|
|
|
|
#define _HSW_AUD_DIG_CNVT_2 0x65180
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define AUD_DIG_CNVT(pipe) _MMIO_PIPE(pipe, _HSW_AUD_DIG_CNVT_1, _HSW_AUD_DIG_CNVT_2)
|
2014-10-27 14:26:52 +00:00
|
|
|
#define DIP_PORT_SEL_MASK 0x3
|
|
|
|
|
|
|
|
#define _HSW_AUD_EDID_DATA_A 0x65050
|
|
|
|
#define _HSW_AUD_EDID_DATA_B 0x65150
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define HSW_AUD_EDID_DATA(pipe) _MMIO_PIPE(pipe, _HSW_AUD_EDID_DATA_A, _HSW_AUD_EDID_DATA_B)
|
2014-10-27 14:26:52 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define HSW_AUD_PIPE_CONV_CFG _MMIO(0x6507c)
|
|
|
|
#define HSW_AUD_PIN_ELD_CP_VLD _MMIO(0x650c0)
|
2014-10-27 14:26:59 +00:00
|
|
|
#define AUDIO_INACTIVE(trans) ((1 << 3) << ((trans) * 4))
|
|
|
|
#define AUDIO_OUTPUT_ENABLE(trans) ((1 << 2) << ((trans) * 4))
|
|
|
|
#define AUDIO_CP_READY(trans) ((1 << 1) << ((trans) * 4))
|
|
|
|
#define AUDIO_ELD_VALID(trans) ((1 << 0) << ((trans) * 4))
|
2012-08-09 08:52:15 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define HSW_AUD_CHICKENBIT _MMIO(0x65f10)
|
2015-05-05 01:05:47 +00:00
|
|
|
#define SKL_AUD_CODEC_WAKE_SIGNAL (1 << 15)
|
|
|
|
|
2012-03-29 15:32:21 +00:00
|
|
|
/* HSW Power Wells */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define HSW_PWR_WELL_BIOS _MMIO(0x45400) /* CTL1 */
|
|
|
|
#define HSW_PWR_WELL_DRIVER _MMIO(0x45404) /* CTL2 */
|
|
|
|
#define HSW_PWR_WELL_KVMR _MMIO(0x45408) /* CTL3 */
|
|
|
|
#define HSW_PWR_WELL_DEBUG _MMIO(0x4540C) /* CTL4 */
|
2013-08-02 19:22:25 +00:00
|
|
|
#define HSW_PWR_WELL_ENABLE_REQUEST (1<<31)
|
|
|
|
#define HSW_PWR_WELL_STATE_ENABLED (1<<30)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define HSW_PWR_WELL_CTL5 _MMIO(0x45410)
|
2012-03-29 15:32:21 +00:00
|
|
|
#define HSW_PWR_WELL_ENABLE_SINGLE_STEP (1<<31)
|
|
|
|
#define HSW_PWR_WELL_PWR_GATE_OVERRIDE (1<<20)
|
2012-08-08 17:15:31 +00:00
|
|
|
#define HSW_PWR_WELL_FORCE_ON (1<<19)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define HSW_PWR_WELL_CTL6 _MMIO(0x45414)
|
2012-03-29 15:32:21 +00:00
|
|
|
|
2015-02-04 13:57:44 +00:00
|
|
|
/* SKL Fuse Status */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define SKL_FUSE_STATUS _MMIO(0x42000)
|
2015-02-04 13:57:44 +00:00
|
|
|
#define SKL_FUSE_DOWNLOAD_STATUS (1<<31)
|
|
|
|
#define SKL_FUSE_PG0_DIST_STATUS (1<<27)
|
|
|
|
#define SKL_FUSE_PG1_DIST_STATUS (1<<26)
|
|
|
|
#define SKL_FUSE_PG2_DIST_STATUS (1<<25)
|
|
|
|
|
2012-03-29 15:32:23 +00:00
|
|
|
/* Per-pipe DDI Function Control */
|
2015-11-04 21:20:01 +00:00
|
|
|
#define _TRANS_DDI_FUNC_CTL_A 0x60400
|
|
|
|
#define _TRANS_DDI_FUNC_CTL_B 0x61400
|
|
|
|
#define _TRANS_DDI_FUNC_CTL_C 0x62400
|
|
|
|
#define _TRANS_DDI_FUNC_CTL_EDP 0x6F400
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define TRANS_DDI_FUNC_CTL(tran) _MMIO_TRANS2(tran, _TRANS_DDI_FUNC_CTL_A)
|
drm/i915: Reorganize display pipe register accesses
RFCv2: Reorganize array indexing so that full offsets can be used as
is. It makes grepping for registers in i915_reg.h much easier. Also
move offset arrays to intel_device_info.
v1: Fixed offsets for VLV, proper eDP handling
v2: Fixed BCLRPAT, PIPESRC, PIPECONF and DSP* macros.
v3: Added EDP pipe comment, removed redundant offset arrays for
MSA_MISC and DDI_FUNC_CTL.
v4: Rename patch and report object size increase.
v5: Change location of commas, add PIPE_EDP into enum pipe
v6: Insert PIPE_EDP_OFFSET into pipe offset array
v7: Set I915_MAX_PIPES back to 3, change more registers accessors
to use the new macros, get rid of _PIPE_INC and add dev_priv
as a parameter where required by the new macros.
Upcoming hardware will not have the various display pipe register
ranges evenly spaced in memory. Change register address calculations
into array lookups.
Tested on SNB, VLV, IVB, Gen2 and HSW w/eDP.
I left the UMS cruft untouched.
Size differences:
text data bss dec hex filename
596431 4634 56 601121 92c21 i915.ko (new)
593199 4634 56 597889 91f81 i915.ko (old)
Signed-off-by: Antti Koskipaa <antti.koskipaa@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Tested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-02-04 12:22:24 +00:00
|
|
|
|
2012-10-24 18:06:19 +00:00
|
|
|
#define TRANS_DDI_FUNC_ENABLE (1<<31)
|
2012-03-29 15:32:23 +00:00
|
|
|
/* Those bits are ignored by pipe EDP since it can only connect to DDI A */
|
2012-10-24 18:06:19 +00:00
|
|
|
#define TRANS_DDI_PORT_MASK (7<<28)
|
2014-06-25 19:01:55 +00:00
|
|
|
#define TRANS_DDI_PORT_SHIFT 28
|
2012-10-24 18:06:19 +00:00
|
|
|
#define TRANS_DDI_SELECT_PORT(x) ((x)<<28)
|
|
|
|
#define TRANS_DDI_PORT_NONE (0<<28)
|
|
|
|
#define TRANS_DDI_MODE_SELECT_MASK (7<<24)
|
|
|
|
#define TRANS_DDI_MODE_SELECT_HDMI (0<<24)
|
|
|
|
#define TRANS_DDI_MODE_SELECT_DVI (1<<24)
|
|
|
|
#define TRANS_DDI_MODE_SELECT_DP_SST (2<<24)
|
|
|
|
#define TRANS_DDI_MODE_SELECT_DP_MST (3<<24)
|
|
|
|
#define TRANS_DDI_MODE_SELECT_FDI (4<<24)
|
|
|
|
#define TRANS_DDI_BPC_MASK (7<<20)
|
|
|
|
#define TRANS_DDI_BPC_8 (0<<20)
|
|
|
|
#define TRANS_DDI_BPC_10 (1<<20)
|
|
|
|
#define TRANS_DDI_BPC_6 (2<<20)
|
|
|
|
#define TRANS_DDI_BPC_12 (3<<20)
|
|
|
|
#define TRANS_DDI_PVSYNC (1<<17)
|
|
|
|
#define TRANS_DDI_PHSYNC (1<<16)
|
|
|
|
#define TRANS_DDI_EDP_INPUT_MASK (7<<12)
|
|
|
|
#define TRANS_DDI_EDP_INPUT_A_ON (0<<12)
|
|
|
|
#define TRANS_DDI_EDP_INPUT_A_ONOFF (4<<12)
|
|
|
|
#define TRANS_DDI_EDP_INPUT_B_ONOFF (5<<12)
|
|
|
|
#define TRANS_DDI_EDP_INPUT_C_ONOFF (6<<12)
|
2014-05-02 01:17:41 +00:00
|
|
|
#define TRANS_DDI_DP_VC_PAYLOAD_ALLOC (1<<8)
|
2012-10-24 18:06:19 +00:00
|
|
|
#define TRANS_DDI_BFI_ENABLE (1<<4)
|
2012-03-29 15:32:23 +00:00
|
|
|
|
2012-03-29 15:32:24 +00:00
|
|
|
/* DisplayPort Transport Control */
|
2015-11-04 21:20:01 +00:00
|
|
|
#define _DP_TP_CTL_A 0x64040
|
|
|
|
#define _DP_TP_CTL_B 0x64140
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define DP_TP_CTL(port) _MMIO_PORT(port, _DP_TP_CTL_A, _DP_TP_CTL_B)
|
2012-08-08 17:15:31 +00:00
|
|
|
#define DP_TP_CTL_ENABLE (1<<31)
|
|
|
|
#define DP_TP_CTL_MODE_SST (0<<27)
|
|
|
|
#define DP_TP_CTL_MODE_MST (1<<27)
|
2014-05-02 01:17:41 +00:00
|
|
|
#define DP_TP_CTL_FORCE_ACT (1<<25)
|
2012-03-29 15:32:24 +00:00
|
|
|
#define DP_TP_CTL_ENHANCED_FRAME_ENABLE (1<<18)
|
2012-08-08 17:15:31 +00:00
|
|
|
#define DP_TP_CTL_FDI_AUTOTRAIN (1<<15)
|
2012-03-29 15:32:24 +00:00
|
|
|
#define DP_TP_CTL_LINK_TRAIN_MASK (7<<8)
|
|
|
|
#define DP_TP_CTL_LINK_TRAIN_PAT1 (0<<8)
|
|
|
|
#define DP_TP_CTL_LINK_TRAIN_PAT2 (1<<8)
|
2012-10-15 18:51:34 +00:00
|
|
|
#define DP_TP_CTL_LINK_TRAIN_PAT3 (4<<8)
|
|
|
|
#define DP_TP_CTL_LINK_TRAIN_IDLE (2<<8)
|
2012-08-08 17:15:31 +00:00
|
|
|
#define DP_TP_CTL_LINK_TRAIN_NORMAL (3<<8)
|
2012-10-15 18:51:34 +00:00
|
|
|
#define DP_TP_CTL_SCRAMBLE_DISABLE (1<<7)
|
2012-03-29 15:32:24 +00:00
|
|
|
|
2012-03-29 15:32:25 +00:00
|
|
|
/* DisplayPort Transport Status */
|
2015-11-04 21:20:01 +00:00
|
|
|
#define _DP_TP_STATUS_A 0x64044
|
|
|
|
#define _DP_TP_STATUS_B 0x64144
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define DP_TP_STATUS(port) _MMIO_PORT(port, _DP_TP_STATUS_A, _DP_TP_STATUS_B)
|
2014-05-02 01:17:41 +00:00
|
|
|
#define DP_TP_STATUS_IDLE_DONE (1<<25)
|
|
|
|
#define DP_TP_STATUS_ACT_SENT (1<<24)
|
|
|
|
#define DP_TP_STATUS_MODE_STATUS_MST (1<<23)
|
|
|
|
#define DP_TP_STATUS_AUTOTRAIN_DONE (1<<12)
|
|
|
|
#define DP_TP_STATUS_PAYLOAD_MAPPING_VC2 (3 << 8)
|
|
|
|
#define DP_TP_STATUS_PAYLOAD_MAPPING_VC1 (3 << 4)
|
|
|
|
#define DP_TP_STATUS_PAYLOAD_MAPPING_VC0 (3 << 0)
|
2012-03-29 15:32:25 +00:00
|
|
|
|
2012-03-29 15:32:26 +00:00
|
|
|
/* DDI Buffer Control */
|
2015-11-04 21:20:01 +00:00
|
|
|
#define _DDI_BUF_CTL_A 0x64000
|
|
|
|
#define _DDI_BUF_CTL_B 0x64100
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define DDI_BUF_CTL(port) _MMIO_PORT(port, _DDI_BUF_CTL_A, _DDI_BUF_CTL_B)
|
2012-08-08 17:15:31 +00:00
|
|
|
#define DDI_BUF_CTL_ENABLE (1<<31)
|
2014-08-11 03:27:36 +00:00
|
|
|
#define DDI_BUF_TRANS_SELECT(n) ((n) << 24)
|
2012-08-08 17:15:31 +00:00
|
|
|
#define DDI_BUF_EMP_MASK (0xf<<24)
|
2012-12-11 18:48:30 +00:00
|
|
|
#define DDI_BUF_PORT_REVERSAL (1<<16)
|
2012-08-08 17:15:31 +00:00
|
|
|
#define DDI_BUF_IS_IDLE (1<<7)
|
2012-11-20 15:27:40 +00:00
|
|
|
#define DDI_A_4_LANES (1<<4)
|
2013-04-30 12:01:40 +00:00
|
|
|
#define DDI_PORT_WIDTH(width) (((width) - 1) << 1)
|
2015-07-06 13:39:15 +00:00
|
|
|
#define DDI_PORT_WIDTH_MASK (7 << 1)
|
|
|
|
#define DDI_PORT_WIDTH_SHIFT 1
|
2012-03-29 15:32:26 +00:00
|
|
|
#define DDI_INIT_DISPLAY_DETECTED (1<<0)
|
|
|
|
|
2012-03-29 15:32:27 +00:00
|
|
|
/* DDI Buffer Translations */
|
2015-11-04 21:20:01 +00:00
|
|
|
#define _DDI_BUF_TRANS_A 0x64E00
|
|
|
|
#define _DDI_BUF_TRANS_B 0x64E60
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define DDI_BUF_TRANS_LO(port, i) _MMIO(_PORT(port, _DDI_BUF_TRANS_A, _DDI_BUF_TRANS_B) + (i) * 8)
|
|
|
|
#define DDI_BUF_TRANS_HI(port, i) _MMIO(_PORT(port, _DDI_BUF_TRANS_A, _DDI_BUF_TRANS_B) + (i) * 8 + 4)
|
2012-03-29 15:32:27 +00:00
|
|
|
|
2012-03-29 15:32:29 +00:00
|
|
|
/* Sideband Interface (SBI) is programmed indirectly, via
|
|
|
|
* SBI_ADDR, which contains the register offset; and SBI_DATA,
|
|
|
|
* which contains the payload */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define SBI_ADDR _MMIO(0xC6000)
|
|
|
|
#define SBI_DATA _MMIO(0xC6004)
|
|
|
|
#define SBI_CTL_STAT _MMIO(0xC6008)
|
2012-12-01 14:04:24 +00:00
|
|
|
#define SBI_CTL_DEST_ICLK (0x0<<16)
|
|
|
|
#define SBI_CTL_DEST_MPHY (0x1<<16)
|
|
|
|
#define SBI_CTL_OP_IORD (0x2<<8)
|
|
|
|
#define SBI_CTL_OP_IOWR (0x3<<8)
|
2012-03-29 15:32:29 +00:00
|
|
|
#define SBI_CTL_OP_CRRD (0x6<<8)
|
|
|
|
#define SBI_CTL_OP_CRWR (0x7<<8)
|
|
|
|
#define SBI_RESPONSE_FAIL (0x1<<1)
|
2012-08-08 17:15:31 +00:00
|
|
|
#define SBI_RESPONSE_SUCCESS (0x0<<1)
|
|
|
|
#define SBI_BUSY (0x1<<0)
|
|
|
|
#define SBI_READY (0x0<<0)
|
2012-03-29 15:32:31 +00:00
|
|
|
|
2012-03-29 15:32:34 +00:00
|
|
|
/* SBI offsets */
|
2015-12-04 20:19:39 +00:00
|
|
|
#define SBI_SSCDIVINTPHASE 0x0200
|
2012-08-08 17:15:31 +00:00
|
|
|
#define SBI_SSCDIVINTPHASE6 0x0600
|
2016-02-17 19:41:12 +00:00
|
|
|
#define SBI_SSCDIVINTPHASE_DIVSEL_SHIFT 1
|
|
|
|
#define SBI_SSCDIVINTPHASE_DIVSEL_MASK (0x7f<<1)
|
2012-03-29 15:32:34 +00:00
|
|
|
#define SBI_SSCDIVINTPHASE_DIVSEL(x) ((x)<<1)
|
2016-02-17 19:41:12 +00:00
|
|
|
#define SBI_SSCDIVINTPHASE_INCVAL_SHIFT 8
|
|
|
|
#define SBI_SSCDIVINTPHASE_INCVAL_MASK (0x7f<<8)
|
2012-03-29 15:32:34 +00:00
|
|
|
#define SBI_SSCDIVINTPHASE_INCVAL(x) ((x)<<8)
|
2012-08-08 17:15:31 +00:00
|
|
|
#define SBI_SSCDIVINTPHASE_DIR(x) ((x)<<15)
|
2012-03-29 15:32:34 +00:00
|
|
|
#define SBI_SSCDIVINTPHASE_PROPAGATE (1<<0)
|
2015-12-04 20:19:39 +00:00
|
|
|
#define SBI_SSCDITHPHASE 0x0204
|
2012-08-08 17:15:31 +00:00
|
|
|
#define SBI_SSCCTL 0x020c
|
2012-03-29 15:32:34 +00:00
|
|
|
#define SBI_SSCCTL6 0x060C
|
2012-12-01 14:04:25 +00:00
|
|
|
#define SBI_SSCCTL_PATHALT (1<<3)
|
2012-08-08 17:15:31 +00:00
|
|
|
#define SBI_SSCCTL_DISABLE (1<<0)
|
2012-03-29 15:32:34 +00:00
|
|
|
#define SBI_SSCAUXDIV6 0x0610
|
2016-02-17 19:41:12 +00:00
|
|
|
#define SBI_SSCAUXDIV_FINALDIV2SEL_SHIFT 4
|
|
|
|
#define SBI_SSCAUXDIV_FINALDIV2SEL_MASK (1<<4)
|
2012-03-29 15:32:34 +00:00
|
|
|
#define SBI_SSCAUXDIV_FINALDIV2SEL(x) ((x)<<4)
|
2012-08-08 17:15:31 +00:00
|
|
|
#define SBI_DBUFF0 0x2a00
|
2013-07-23 14:19:24 +00:00
|
|
|
#define SBI_GEN0 0x1f00
|
|
|
|
#define SBI_GEN0_CFG_BUFFENABLE_DISABLE (1<<0)
|
2012-03-29 15:32:34 +00:00
|
|
|
|
2012-03-29 15:32:31 +00:00
|
|
|
/* LPT PIXCLK_GATE */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define PIXCLK_GATE _MMIO(0xC6020)
|
2012-08-08 17:15:32 +00:00
|
|
|
#define PIXCLK_GATE_UNGATE (1<<0)
|
|
|
|
#define PIXCLK_GATE_GATE (0<<0)
|
2012-03-29 15:32:31 +00:00
|
|
|
|
2012-03-29 15:32:32 +00:00
|
|
|
/* SPLL */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define SPLL_CTL _MMIO(0x46020)
|
2012-03-29 15:32:32 +00:00
|
|
|
#define SPLL_PLL_ENABLE (1<<31)
|
2012-10-11 14:24:04 +00:00
|
|
|
#define SPLL_PLL_SSC (1<<28)
|
|
|
|
#define SPLL_PLL_NON_SSC (2<<28)
|
2014-01-21 20:42:10 +00:00
|
|
|
#define SPLL_PLL_LCPLL (3<<28)
|
|
|
|
#define SPLL_PLL_REF_MASK (3<<28)
|
2012-08-08 17:15:31 +00:00
|
|
|
#define SPLL_PLL_FREQ_810MHz (0<<26)
|
|
|
|
#define SPLL_PLL_FREQ_1350MHz (1<<26)
|
2014-01-21 20:42:10 +00:00
|
|
|
#define SPLL_PLL_FREQ_2700MHz (2<<26)
|
|
|
|
#define SPLL_PLL_FREQ_MASK (3<<26)
|
2012-03-29 15:32:32 +00:00
|
|
|
|
2012-03-29 15:32:36 +00:00
|
|
|
/* WRPLL */
|
2015-11-04 21:20:01 +00:00
|
|
|
#define _WRPLL_CTL1 0x46040
|
|
|
|
#define _WRPLL_CTL2 0x46060
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define WRPLL_CTL(pll) _MMIO_PIPE(pll, _WRPLL_CTL1, _WRPLL_CTL2)
|
2012-08-08 17:15:31 +00:00
|
|
|
#define WRPLL_PLL_ENABLE (1<<31)
|
2014-06-25 19:01:48 +00:00
|
|
|
#define WRPLL_PLL_SSC (1<<28)
|
|
|
|
#define WRPLL_PLL_NON_SSC (2<<28)
|
|
|
|
#define WRPLL_PLL_LCPLL (3<<28)
|
|
|
|
#define WRPLL_PLL_REF_MASK (3<<28)
|
2012-04-13 20:08:38 +00:00
|
|
|
/* WRPLL divider programming */
|
2012-08-08 17:15:31 +00:00
|
|
|
#define WRPLL_DIVIDER_REFERENCE(x) ((x)<<0)
|
2014-01-21 20:42:10 +00:00
|
|
|
#define WRPLL_DIVIDER_REF_MASK (0xff)
|
2012-08-08 17:15:31 +00:00
|
|
|
#define WRPLL_DIVIDER_POST(x) ((x)<<8)
|
2014-01-21 20:42:10 +00:00
|
|
|
#define WRPLL_DIVIDER_POST_MASK (0x3f<<8)
|
|
|
|
#define WRPLL_DIVIDER_POST_SHIFT 8
|
2012-08-08 17:15:31 +00:00
|
|
|
#define WRPLL_DIVIDER_FEEDBACK(x) ((x)<<16)
|
2014-01-21 20:42:10 +00:00
|
|
|
#define WRPLL_DIVIDER_FB_SHIFT 16
|
|
|
|
#define WRPLL_DIVIDER_FB_MASK (0xff<<16)
|
2012-03-29 15:32:36 +00:00
|
|
|
|
2012-03-29 15:32:33 +00:00
|
|
|
/* Port clock selection */
|
2015-11-04 21:20:01 +00:00
|
|
|
#define _PORT_CLK_SEL_A 0x46100
|
|
|
|
#define _PORT_CLK_SEL_B 0x46104
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define PORT_CLK_SEL(port) _MMIO_PORT(port, _PORT_CLK_SEL_A, _PORT_CLK_SEL_B)
|
2012-03-29 15:32:33 +00:00
|
|
|
#define PORT_CLK_SEL_LCPLL_2700 (0<<29)
|
|
|
|
#define PORT_CLK_SEL_LCPLL_1350 (1<<29)
|
|
|
|
#define PORT_CLK_SEL_LCPLL_810 (2<<29)
|
2012-08-08 17:15:31 +00:00
|
|
|
#define PORT_CLK_SEL_SPLL (3<<29)
|
2014-06-25 19:02:02 +00:00
|
|
|
#define PORT_CLK_SEL_WRPLL(pll) (((pll)+4)<<29)
|
2012-03-29 15:32:33 +00:00
|
|
|
#define PORT_CLK_SEL_WRPLL1 (4<<29)
|
|
|
|
#define PORT_CLK_SEL_WRPLL2 (5<<29)
|
2012-10-05 15:05:58 +00:00
|
|
|
#define PORT_CLK_SEL_NONE (7<<29)
|
2014-01-21 20:42:10 +00:00
|
|
|
#define PORT_CLK_SEL_MASK (7<<29)
|
2012-03-29 15:32:33 +00:00
|
|
|
|
2012-10-23 20:29:56 +00:00
|
|
|
/* Transcoder clock selection */
|
2015-11-04 21:20:01 +00:00
|
|
|
#define _TRANS_CLK_SEL_A 0x46140
|
|
|
|
#define _TRANS_CLK_SEL_B 0x46144
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define TRANS_CLK_SEL(tran) _MMIO_TRANS(tran, _TRANS_CLK_SEL_A, _TRANS_CLK_SEL_B)
|
2012-10-23 20:29:56 +00:00
|
|
|
/* For each transcoder, we need to select the corresponding port clock */
|
|
|
|
#define TRANS_CLK_SEL_DISABLED (0x0<<29)
|
2015-09-18 17:03:39 +00:00
|
|
|
#define TRANS_CLK_SEL_PORT(x) (((x)+1)<<29)
|
2012-03-29 15:32:33 +00:00
|
|
|
|
2016-04-26 16:46:32 +00:00
|
|
|
#define CDCLK_FREQ _MMIO(0x46200)
|
|
|
|
|
2015-11-04 21:20:01 +00:00
|
|
|
#define _TRANSA_MSA_MISC 0x60410
|
|
|
|
#define _TRANSB_MSA_MISC 0x61410
|
|
|
|
#define _TRANSC_MSA_MISC 0x62410
|
|
|
|
#define _TRANS_EDP_MSA_MISC 0x6f410
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define TRANS_MSA_MISC(tran) _MMIO_TRANS2(tran, _TRANSA_MSA_MISC)
|
drm/i915: Reorganize display pipe register accesses
RFCv2: Reorganize array indexing so that full offsets can be used as
is. It makes grepping for registers in i915_reg.h much easier. Also
move offset arrays to intel_device_info.
v1: Fixed offsets for VLV, proper eDP handling
v2: Fixed BCLRPAT, PIPESRC, PIPECONF and DSP* macros.
v3: Added EDP pipe comment, removed redundant offset arrays for
MSA_MISC and DDI_FUNC_CTL.
v4: Rename patch and report object size increase.
v5: Change location of commas, add PIPE_EDP into enum pipe
v6: Insert PIPE_EDP_OFFSET into pipe offset array
v7: Set I915_MAX_PIPES back to 3, change more registers accessors
to use the new macros, get rid of _PIPE_INC and add dev_priv
as a parameter where required by the new macros.
Upcoming hardware will not have the various display pipe register
ranges evenly spaced in memory. Change register address calculations
into array lookups.
Tested on SNB, VLV, IVB, Gen2 and HSW w/eDP.
I left the UMS cruft untouched.
Size differences:
text data bss dec hex filename
596431 4634 56 601121 92c21 i915.ko (new)
593199 4634 56 597889 91f81 i915.ko (old)
Signed-off-by: Antti Koskipaa <antti.koskipaa@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Tested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-02-04 12:22:24 +00:00
|
|
|
|
2012-10-23 20:30:00 +00:00
|
|
|
#define TRANS_MSA_SYNC_CLK (1<<0)
|
|
|
|
#define TRANS_MSA_6_BPC (0<<5)
|
|
|
|
#define TRANS_MSA_8_BPC (1<<5)
|
|
|
|
#define TRANS_MSA_10_BPC (2<<5)
|
|
|
|
#define TRANS_MSA_12_BPC (3<<5)
|
|
|
|
#define TRANS_MSA_16_BPC (4<<5)
|
2012-10-15 18:51:30 +00:00
|
|
|
|
2012-03-29 15:32:35 +00:00
|
|
|
/* LCPLL Control */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define LCPLL_CTL _MMIO(0x130040)
|
2012-03-29 15:32:35 +00:00
|
|
|
#define LCPLL_PLL_DISABLE (1<<31)
|
|
|
|
#define LCPLL_PLL_LOCK (1<<30)
|
2012-10-05 15:05:52 +00:00
|
|
|
#define LCPLL_CLK_FREQ_MASK (3<<26)
|
|
|
|
#define LCPLL_CLK_FREQ_450 (0<<26)
|
2013-11-03 04:07:36 +00:00
|
|
|
#define LCPLL_CLK_FREQ_54O_BDW (1<<26)
|
|
|
|
#define LCPLL_CLK_FREQ_337_5_BDW (2<<26)
|
|
|
|
#define LCPLL_CLK_FREQ_675_BDW (3<<26)
|
2012-08-08 17:15:31 +00:00
|
|
|
#define LCPLL_CD_CLOCK_DISABLE (1<<25)
|
2015-06-03 12:45:13 +00:00
|
|
|
#define LCPLL_ROOT_CD_CLOCK_DISABLE (1<<24)
|
2012-03-29 15:32:35 +00:00
|
|
|
#define LCPLL_CD2X_CLOCK_DISABLE (1<<23)
|
2013-07-23 14:19:26 +00:00
|
|
|
#define LCPLL_POWER_DOWN_ALLOW (1<<22)
|
2012-10-05 15:05:52 +00:00
|
|
|
#define LCPLL_CD_SOURCE_FCLK (1<<21)
|
2013-07-23 14:19:26 +00:00
|
|
|
#define LCPLL_CD_SOURCE_FCLK_DONE (1<<19)
|
|
|
|
|
2014-11-13 14:55:13 +00:00
|
|
|
/*
|
|
|
|
* SKL Clocks
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* CDCLK_CTL */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define CDCLK_CTL _MMIO(0x46000)
|
2014-11-13 14:55:13 +00:00
|
|
|
#define CDCLK_FREQ_SEL_MASK (3<<26)
|
|
|
|
#define CDCLK_FREQ_450_432 (0<<26)
|
|
|
|
#define CDCLK_FREQ_540 (1<<26)
|
|
|
|
#define CDCLK_FREQ_337_308 (2<<26)
|
|
|
|
#define CDCLK_FREQ_675_617 (3<<26)
|
2014-11-24 08:07:39 +00:00
|
|
|
#define BXT_CDCLK_CD2X_DIV_SEL_MASK (3<<22)
|
|
|
|
#define BXT_CDCLK_CD2X_DIV_SEL_1 (0<<22)
|
|
|
|
#define BXT_CDCLK_CD2X_DIV_SEL_1_5 (1<<22)
|
|
|
|
#define BXT_CDCLK_CD2X_DIV_SEL_2 (2<<22)
|
|
|
|
#define BXT_CDCLK_CD2X_DIV_SEL_4 (3<<22)
|
2016-05-11 19:44:51 +00:00
|
|
|
#define BXT_CDCLK_CD2X_PIPE(pipe) ((pipe)<<20)
|
|
|
|
#define BXT_CDCLK_CD2X_PIPE_NONE BXT_CDCLK_CD2X_PIPE(3)
|
2014-11-24 08:07:39 +00:00
|
|
|
#define BXT_CDCLK_SSA_PRECHARGE_ENABLE (1<<16)
|
2016-05-11 19:44:51 +00:00
|
|
|
#define CDCLK_FREQ_DECIMAL_MASK (0x7ff)
|
2014-11-24 08:07:39 +00:00
|
|
|
|
2014-11-13 14:55:13 +00:00
|
|
|
/* LCPLL_CTL */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define LCPLL1_CTL _MMIO(0x46010)
|
|
|
|
#define LCPLL2_CTL _MMIO(0x46014)
|
2014-11-13 14:55:13 +00:00
|
|
|
#define LCPLL_PLL_ENABLE (1<<31)
|
|
|
|
|
|
|
|
/* DPLL control1 */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define DPLL_CTRL1 _MMIO(0x6C058)
|
2014-11-13 14:55:13 +00:00
|
|
|
#define DPLL_CTRL1_HDMI_MODE(id) (1<<((id)*6+5))
|
|
|
|
#define DPLL_CTRL1_SSC(id) (1<<((id)*6+4))
|
2015-04-30 15:39:17 +00:00
|
|
|
#define DPLL_CTRL1_LINK_RATE_MASK(id) (7<<((id)*6+1))
|
|
|
|
#define DPLL_CTRL1_LINK_RATE_SHIFT(id) ((id)*6+1)
|
|
|
|
#define DPLL_CTRL1_LINK_RATE(linkrate, id) ((linkrate)<<((id)*6+1))
|
2014-11-13 14:55:13 +00:00
|
|
|
#define DPLL_CTRL1_OVERRIDE(id) (1<<((id)*6))
|
2015-04-30 15:39:17 +00:00
|
|
|
#define DPLL_CTRL1_LINK_RATE_2700 0
|
|
|
|
#define DPLL_CTRL1_LINK_RATE_1350 1
|
|
|
|
#define DPLL_CTRL1_LINK_RATE_810 2
|
|
|
|
#define DPLL_CTRL1_LINK_RATE_1620 3
|
|
|
|
#define DPLL_CTRL1_LINK_RATE_1080 4
|
|
|
|
#define DPLL_CTRL1_LINK_RATE_2160 5
|
2014-11-13 14:55:13 +00:00
|
|
|
|
|
|
|
/* DPLL control2 */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define DPLL_CTRL2 _MMIO(0x6C05C)
|
2015-09-18 17:03:39 +00:00
|
|
|
#define DPLL_CTRL2_DDI_CLK_OFF(port) (1<<((port)+15))
|
2014-11-13 14:55:13 +00:00
|
|
|
#define DPLL_CTRL2_DDI_CLK_SEL_MASK(port) (3<<((port)*3+1))
|
2014-11-13 14:55:16 +00:00
|
|
|
#define DPLL_CTRL2_DDI_CLK_SEL_SHIFT(port) ((port)*3+1)
|
2015-09-18 17:03:39 +00:00
|
|
|
#define DPLL_CTRL2_DDI_CLK_SEL(clk, port) ((clk)<<((port)*3+1))
|
2014-11-13 14:55:13 +00:00
|
|
|
#define DPLL_CTRL2_DDI_SEL_OVERRIDE(port) (1<<((port)*3))
|
|
|
|
|
|
|
|
/* DPLL Status */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define DPLL_STATUS _MMIO(0x6C060)
|
2014-11-13 14:55:13 +00:00
|
|
|
#define DPLL_LOCK(id) (1<<((id)*8))
|
|
|
|
|
|
|
|
/* DPLL cfg */
|
2015-11-04 21:20:01 +00:00
|
|
|
#define _DPLL1_CFGCR1 0x6C040
|
|
|
|
#define _DPLL2_CFGCR1 0x6C048
|
|
|
|
#define _DPLL3_CFGCR1 0x6C050
|
2014-11-13 14:55:13 +00:00
|
|
|
#define DPLL_CFGCR1_FREQ_ENABLE (1<<31)
|
|
|
|
#define DPLL_CFGCR1_DCO_FRACTION_MASK (0x7fff<<9)
|
2015-09-18 17:03:39 +00:00
|
|
|
#define DPLL_CFGCR1_DCO_FRACTION(x) ((x)<<9)
|
2014-11-13 14:55:13 +00:00
|
|
|
#define DPLL_CFGCR1_DCO_INTEGER_MASK (0x1ff)
|
|
|
|
|
2015-11-04 21:20:01 +00:00
|
|
|
#define _DPLL1_CFGCR2 0x6C044
|
|
|
|
#define _DPLL2_CFGCR2 0x6C04C
|
|
|
|
#define _DPLL3_CFGCR2 0x6C054
|
2014-11-13 14:55:13 +00:00
|
|
|
#define DPLL_CFGCR2_QDIV_RATIO_MASK (0xff<<8)
|
2015-09-18 17:03:39 +00:00
|
|
|
#define DPLL_CFGCR2_QDIV_RATIO(x) ((x)<<8)
|
|
|
|
#define DPLL_CFGCR2_QDIV_MODE(x) ((x)<<7)
|
2014-11-13 14:55:13 +00:00
|
|
|
#define DPLL_CFGCR2_KDIV_MASK (3<<5)
|
2015-09-18 17:03:39 +00:00
|
|
|
#define DPLL_CFGCR2_KDIV(x) ((x)<<5)
|
2014-11-13 14:55:13 +00:00
|
|
|
#define DPLL_CFGCR2_KDIV_5 (0<<5)
|
|
|
|
#define DPLL_CFGCR2_KDIV_2 (1<<5)
|
|
|
|
#define DPLL_CFGCR2_KDIV_3 (2<<5)
|
|
|
|
#define DPLL_CFGCR2_KDIV_1 (3<<5)
|
|
|
|
#define DPLL_CFGCR2_PDIV_MASK (7<<2)
|
2015-09-18 17:03:39 +00:00
|
|
|
#define DPLL_CFGCR2_PDIV(x) ((x)<<2)
|
2014-11-13 14:55:13 +00:00
|
|
|
#define DPLL_CFGCR2_PDIV_1 (0<<2)
|
|
|
|
#define DPLL_CFGCR2_PDIV_2 (1<<2)
|
|
|
|
#define DPLL_CFGCR2_PDIV_3 (2<<2)
|
|
|
|
#define DPLL_CFGCR2_PDIV_7 (4<<2)
|
|
|
|
#define DPLL_CFGCR2_CENTRAL_FREQ_MASK (3)
|
|
|
|
|
2016-02-04 15:43:21 +00:00
|
|
|
#define DPLL_CFGCR1(id) _MMIO_PIPE((id) - SKL_DPLL1, _DPLL1_CFGCR1, _DPLL2_CFGCR1)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define DPLL_CFGCR2(id) _MMIO_PIPE((id) - SKL_DPLL1, _DPLL1_CFGCR2, _DPLL2_CFGCR2)
|
2014-11-13 14:55:16 +00:00
|
|
|
|
2014-11-24 08:07:39 +00:00
|
|
|
/* BXT display engine PLL */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define BXT_DE_PLL_CTL _MMIO(0x6d000)
|
2014-11-24 08:07:39 +00:00
|
|
|
#define BXT_DE_PLL_RATIO(x) (x) /* {60,65,100} * 19.2MHz */
|
|
|
|
#define BXT_DE_PLL_RATIO_MASK 0xff
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define BXT_DE_PLL_ENABLE _MMIO(0x46070)
|
2014-11-24 08:07:39 +00:00
|
|
|
#define BXT_DE_PLL_PLL_ENABLE (1 << 31)
|
|
|
|
#define BXT_DE_PLL_LOCK (1 << 30)
|
|
|
|
|
2014-11-24 08:07:44 +00:00
|
|
|
/* GEN9 DC */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define DC_STATE_EN _MMIO(0x45504)
|
2015-11-04 17:24:16 +00:00
|
|
|
#define DC_STATE_DISABLE 0
|
2014-11-24 08:07:44 +00:00
|
|
|
#define DC_STATE_EN_UPTO_DC5 (1<<0)
|
|
|
|
#define DC_STATE_EN_DC9 (1<<3)
|
2015-04-16 08:52:09 +00:00
|
|
|
#define DC_STATE_EN_UPTO_DC6 (2<<0)
|
|
|
|
#define DC_STATE_EN_UPTO_DC5_DC6_MASK 0x3
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define DC_STATE_DEBUG _MMIO(0x45520)
|
2016-02-19 10:26:04 +00:00
|
|
|
#define DC_STATE_DEBUG_MASK_CORES (1<<0)
|
2015-04-16 08:52:09 +00:00
|
|
|
#define DC_STATE_DEBUG_MASK_MEMORY_UP (1<<1)
|
|
|
|
|
2014-07-04 14:59:58 +00:00
|
|
|
/* Please see hsw_read_dcomp() and hsw_write_dcomp() before using this register,
|
|
|
|
* since on HSW we can't write to it using I915_WRITE. */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define D_COMP_HSW _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x5F0C)
|
|
|
|
#define D_COMP_BDW _MMIO(0x138144)
|
2013-07-23 14:19:26 +00:00
|
|
|
#define D_COMP_RCOMP_IN_PROGRESS (1<<9)
|
|
|
|
#define D_COMP_COMP_FORCE (1<<8)
|
|
|
|
#define D_COMP_COMP_DISABLE (1<<0)
|
2012-03-29 15:32:35 +00:00
|
|
|
|
2012-03-29 15:32:37 +00:00
|
|
|
/* Pipe WM_LINETIME - watermark line time */
|
2015-11-04 21:20:01 +00:00
|
|
|
#define _PIPE_WM_LINETIME_A 0x45270
|
|
|
|
#define _PIPE_WM_LINETIME_B 0x45274
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define PIPE_WM_LINETIME(pipe) _MMIO_PIPE(pipe, _PIPE_WM_LINETIME_A, _PIPE_WM_LINETIME_B)
|
2012-08-08 17:15:31 +00:00
|
|
|
#define PIPE_WM_LINETIME_MASK (0x1ff)
|
|
|
|
#define PIPE_WM_LINETIME_TIME(x) ((x))
|
2012-03-29 15:32:37 +00:00
|
|
|
#define PIPE_WM_LINETIME_IPS_LINETIME_MASK (0x1ff<<16)
|
2012-08-08 17:15:31 +00:00
|
|
|
#define PIPE_WM_LINETIME_IPS_LINETIME(x) ((x)<<16)
|
2012-03-29 15:32:38 +00:00
|
|
|
|
|
|
|
/* SFUSE_STRAP */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define SFUSE_STRAP _MMIO(0xc2014)
|
2014-02-10 17:19:45 +00:00
|
|
|
#define SFUSE_STRAP_FUSE_LOCK (1<<13)
|
|
|
|
#define SFUSE_STRAP_DISPLAY_DISABLED (1<<7)
|
2015-12-01 21:28:55 +00:00
|
|
|
#define SFUSE_STRAP_CRT_DISABLED (1<<6)
|
2012-03-29 15:32:38 +00:00
|
|
|
#define SFUSE_STRAP_DDIB_DETECTED (1<<2)
|
|
|
|
#define SFUSE_STRAP_DDIC_DETECTED (1<<1)
|
|
|
|
#define SFUSE_STRAP_DDID_DETECTED (1<<0)
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define WM_MISC _MMIO(0x45260)
|
2013-05-31 13:08:35 +00:00
|
|
|
#define WM_MISC_DATA_PARTITION_5_6 (1 << 0)
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define WM_DBG _MMIO(0x45280)
|
2012-07-02 14:51:10 +00:00
|
|
|
#define WM_DBG_DISALLOW_MULTIPLE_LP (1<<0)
|
|
|
|
#define WM_DBG_DISALLOW_MAXFIFO (1<<1)
|
|
|
|
#define WM_DBG_DISALLOW_SPRITE (1<<2)
|
|
|
|
|
2013-01-18 17:11:38 +00:00
|
|
|
/* pipe CSC */
|
|
|
|
#define _PIPE_A_CSC_COEFF_RY_GY 0x49010
|
|
|
|
#define _PIPE_A_CSC_COEFF_BY 0x49014
|
|
|
|
#define _PIPE_A_CSC_COEFF_RU_GU 0x49018
|
|
|
|
#define _PIPE_A_CSC_COEFF_BU 0x4901c
|
|
|
|
#define _PIPE_A_CSC_COEFF_RV_GV 0x49020
|
|
|
|
#define _PIPE_A_CSC_COEFF_BV 0x49024
|
|
|
|
#define _PIPE_A_CSC_MODE 0x49028
|
2013-04-19 09:23:02 +00:00
|
|
|
#define CSC_BLACK_SCREEN_OFFSET (1 << 2)
|
|
|
|
#define CSC_POSITION_BEFORE_GAMMA (1 << 1)
|
|
|
|
#define CSC_MODE_YUV_TO_RGB (1 << 0)
|
2013-01-18 17:11:38 +00:00
|
|
|
#define _PIPE_A_CSC_PREOFF_HI 0x49030
|
|
|
|
#define _PIPE_A_CSC_PREOFF_ME 0x49034
|
|
|
|
#define _PIPE_A_CSC_PREOFF_LO 0x49038
|
|
|
|
#define _PIPE_A_CSC_POSTOFF_HI 0x49040
|
|
|
|
#define _PIPE_A_CSC_POSTOFF_ME 0x49044
|
|
|
|
#define _PIPE_A_CSC_POSTOFF_LO 0x49048
|
|
|
|
|
|
|
|
#define _PIPE_B_CSC_COEFF_RY_GY 0x49110
|
|
|
|
#define _PIPE_B_CSC_COEFF_BY 0x49114
|
|
|
|
#define _PIPE_B_CSC_COEFF_RU_GU 0x49118
|
|
|
|
#define _PIPE_B_CSC_COEFF_BU 0x4911c
|
|
|
|
#define _PIPE_B_CSC_COEFF_RV_GV 0x49120
|
|
|
|
#define _PIPE_B_CSC_COEFF_BV 0x49124
|
|
|
|
#define _PIPE_B_CSC_MODE 0x49128
|
|
|
|
#define _PIPE_B_CSC_PREOFF_HI 0x49130
|
|
|
|
#define _PIPE_B_CSC_PREOFF_ME 0x49134
|
|
|
|
#define _PIPE_B_CSC_PREOFF_LO 0x49138
|
|
|
|
#define _PIPE_B_CSC_POSTOFF_HI 0x49140
|
|
|
|
#define _PIPE_B_CSC_POSTOFF_ME 0x49144
|
|
|
|
#define _PIPE_B_CSC_POSTOFF_LO 0x49148
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define PIPE_CSC_COEFF_RY_GY(pipe) _MMIO_PIPE(pipe, _PIPE_A_CSC_COEFF_RY_GY, _PIPE_B_CSC_COEFF_RY_GY)
|
|
|
|
#define PIPE_CSC_COEFF_BY(pipe) _MMIO_PIPE(pipe, _PIPE_A_CSC_COEFF_BY, _PIPE_B_CSC_COEFF_BY)
|
|
|
|
#define PIPE_CSC_COEFF_RU_GU(pipe) _MMIO_PIPE(pipe, _PIPE_A_CSC_COEFF_RU_GU, _PIPE_B_CSC_COEFF_RU_GU)
|
|
|
|
#define PIPE_CSC_COEFF_BU(pipe) _MMIO_PIPE(pipe, _PIPE_A_CSC_COEFF_BU, _PIPE_B_CSC_COEFF_BU)
|
|
|
|
#define PIPE_CSC_COEFF_RV_GV(pipe) _MMIO_PIPE(pipe, _PIPE_A_CSC_COEFF_RV_GV, _PIPE_B_CSC_COEFF_RV_GV)
|
|
|
|
#define PIPE_CSC_COEFF_BV(pipe) _MMIO_PIPE(pipe, _PIPE_A_CSC_COEFF_BV, _PIPE_B_CSC_COEFF_BV)
|
|
|
|
#define PIPE_CSC_MODE(pipe) _MMIO_PIPE(pipe, _PIPE_A_CSC_MODE, _PIPE_B_CSC_MODE)
|
|
|
|
#define PIPE_CSC_PREOFF_HI(pipe) _MMIO_PIPE(pipe, _PIPE_A_CSC_PREOFF_HI, _PIPE_B_CSC_PREOFF_HI)
|
|
|
|
#define PIPE_CSC_PREOFF_ME(pipe) _MMIO_PIPE(pipe, _PIPE_A_CSC_PREOFF_ME, _PIPE_B_CSC_PREOFF_ME)
|
|
|
|
#define PIPE_CSC_PREOFF_LO(pipe) _MMIO_PIPE(pipe, _PIPE_A_CSC_PREOFF_LO, _PIPE_B_CSC_PREOFF_LO)
|
|
|
|
#define PIPE_CSC_POSTOFF_HI(pipe) _MMIO_PIPE(pipe, _PIPE_A_CSC_POSTOFF_HI, _PIPE_B_CSC_POSTOFF_HI)
|
|
|
|
#define PIPE_CSC_POSTOFF_ME(pipe) _MMIO_PIPE(pipe, _PIPE_A_CSC_POSTOFF_ME, _PIPE_B_CSC_POSTOFF_ME)
|
|
|
|
#define PIPE_CSC_POSTOFF_LO(pipe) _MMIO_PIPE(pipe, _PIPE_A_CSC_POSTOFF_LO, _PIPE_B_CSC_POSTOFF_LO)
|
2013-01-18 17:11:38 +00:00
|
|
|
|
2016-03-16 10:57:16 +00:00
|
|
|
/* pipe degamma/gamma LUTs on IVB+ */
|
|
|
|
#define _PAL_PREC_INDEX_A 0x4A400
|
|
|
|
#define _PAL_PREC_INDEX_B 0x4AC00
|
|
|
|
#define _PAL_PREC_INDEX_C 0x4B400
|
|
|
|
#define PAL_PREC_10_12_BIT (0 << 31)
|
|
|
|
#define PAL_PREC_SPLIT_MODE (1 << 31)
|
|
|
|
#define PAL_PREC_AUTO_INCREMENT (1 << 15)
|
|
|
|
#define _PAL_PREC_DATA_A 0x4A404
|
|
|
|
#define _PAL_PREC_DATA_B 0x4AC04
|
|
|
|
#define _PAL_PREC_DATA_C 0x4B404
|
|
|
|
#define _PAL_PREC_GC_MAX_A 0x4A410
|
|
|
|
#define _PAL_PREC_GC_MAX_B 0x4AC10
|
|
|
|
#define _PAL_PREC_GC_MAX_C 0x4B410
|
|
|
|
#define _PAL_PREC_EXT_GC_MAX_A 0x4A420
|
|
|
|
#define _PAL_PREC_EXT_GC_MAX_B 0x4AC20
|
|
|
|
#define _PAL_PREC_EXT_GC_MAX_C 0x4B420
|
|
|
|
|
|
|
|
#define PREC_PAL_INDEX(pipe) _MMIO_PIPE(pipe, _PAL_PREC_INDEX_A, _PAL_PREC_INDEX_B)
|
|
|
|
#define PREC_PAL_DATA(pipe) _MMIO_PIPE(pipe, _PAL_PREC_DATA_A, _PAL_PREC_DATA_B)
|
|
|
|
#define PREC_PAL_GC_MAX(pipe, i) _MMIO(_PIPE(pipe, _PAL_PREC_GC_MAX_A, _PAL_PREC_GC_MAX_B) + (i) * 4)
|
|
|
|
#define PREC_PAL_EXT_GC_MAX(pipe, i) _MMIO(_PIPE(pipe, _PAL_PREC_EXT_GC_MAX_A, _PAL_PREC_EXT_GC_MAX_B) + (i) * 4)
|
|
|
|
|
2016-03-16 10:57:17 +00:00
|
|
|
/* pipe CSC & degamma/gamma LUTs on CHV */
|
|
|
|
#define _CGM_PIPE_A_CSC_COEFF01 (VLV_DISPLAY_BASE + 0x67900)
|
|
|
|
#define _CGM_PIPE_A_CSC_COEFF23 (VLV_DISPLAY_BASE + 0x67904)
|
|
|
|
#define _CGM_PIPE_A_CSC_COEFF45 (VLV_DISPLAY_BASE + 0x67908)
|
|
|
|
#define _CGM_PIPE_A_CSC_COEFF67 (VLV_DISPLAY_BASE + 0x6790C)
|
|
|
|
#define _CGM_PIPE_A_CSC_COEFF8 (VLV_DISPLAY_BASE + 0x67910)
|
|
|
|
#define _CGM_PIPE_A_DEGAMMA (VLV_DISPLAY_BASE + 0x66000)
|
|
|
|
#define _CGM_PIPE_A_GAMMA (VLV_DISPLAY_BASE + 0x67000)
|
|
|
|
#define _CGM_PIPE_A_MODE (VLV_DISPLAY_BASE + 0x67A00)
|
|
|
|
#define CGM_PIPE_MODE_GAMMA (1 << 2)
|
|
|
|
#define CGM_PIPE_MODE_CSC (1 << 1)
|
|
|
|
#define CGM_PIPE_MODE_DEGAMMA (1 << 0)
|
|
|
|
|
|
|
|
#define _CGM_PIPE_B_CSC_COEFF01 (VLV_DISPLAY_BASE + 0x69900)
|
|
|
|
#define _CGM_PIPE_B_CSC_COEFF23 (VLV_DISPLAY_BASE + 0x69904)
|
|
|
|
#define _CGM_PIPE_B_CSC_COEFF45 (VLV_DISPLAY_BASE + 0x69908)
|
|
|
|
#define _CGM_PIPE_B_CSC_COEFF67 (VLV_DISPLAY_BASE + 0x6990C)
|
|
|
|
#define _CGM_PIPE_B_CSC_COEFF8 (VLV_DISPLAY_BASE + 0x69910)
|
|
|
|
#define _CGM_PIPE_B_DEGAMMA (VLV_DISPLAY_BASE + 0x68000)
|
|
|
|
#define _CGM_PIPE_B_GAMMA (VLV_DISPLAY_BASE + 0x69000)
|
|
|
|
#define _CGM_PIPE_B_MODE (VLV_DISPLAY_BASE + 0x69A00)
|
|
|
|
|
|
|
|
#define CGM_PIPE_CSC_COEFF01(pipe) _MMIO_PIPE(pipe, _CGM_PIPE_A_CSC_COEFF01, _CGM_PIPE_B_CSC_COEFF01)
|
|
|
|
#define CGM_PIPE_CSC_COEFF23(pipe) _MMIO_PIPE(pipe, _CGM_PIPE_A_CSC_COEFF23, _CGM_PIPE_B_CSC_COEFF23)
|
|
|
|
#define CGM_PIPE_CSC_COEFF45(pipe) _MMIO_PIPE(pipe, _CGM_PIPE_A_CSC_COEFF45, _CGM_PIPE_B_CSC_COEFF45)
|
|
|
|
#define CGM_PIPE_CSC_COEFF67(pipe) _MMIO_PIPE(pipe, _CGM_PIPE_A_CSC_COEFF67, _CGM_PIPE_B_CSC_COEFF67)
|
|
|
|
#define CGM_PIPE_CSC_COEFF8(pipe) _MMIO_PIPE(pipe, _CGM_PIPE_A_CSC_COEFF8, _CGM_PIPE_B_CSC_COEFF8)
|
|
|
|
#define CGM_PIPE_DEGAMMA(pipe, i, w) _MMIO(_PIPE(pipe, _CGM_PIPE_A_DEGAMMA, _CGM_PIPE_B_DEGAMMA) + (i) * 8 + (w) * 4)
|
|
|
|
#define CGM_PIPE_GAMMA(pipe, i, w) _MMIO(_PIPE(pipe, _CGM_PIPE_A_GAMMA, _CGM_PIPE_B_GAMMA) + (i) * 8 + (w) * 4)
|
|
|
|
#define CGM_PIPE_MODE(pipe) _MMIO_PIPE(pipe, _CGM_PIPE_A_MODE, _CGM_PIPE_B_MODE)
|
|
|
|
|
2014-11-14 14:54:21 +00:00
|
|
|
/* MIPI DSI registers */
|
|
|
|
|
|
|
|
#define _MIPI_PORT(port, a, c) _PORT3(port, a, 0, c) /* ports A and C only */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define _MMIO_MIPI(port, a, c) _MMIO(_MIPI_PORT(port, a, c))
|
2013-08-27 12:12:16 +00:00
|
|
|
|
2015-09-23 17:57:17 +00:00
|
|
|
/* BXT MIPI clock controls */
|
|
|
|
#define BXT_MAX_VAR_OUTPUT_KHZ 39500
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define BXT_MIPI_CLOCK_CTL _MMIO(0x46090)
|
2015-09-23 17:57:17 +00:00
|
|
|
#define BXT_MIPI1_DIV_SHIFT 26
|
|
|
|
#define BXT_MIPI2_DIV_SHIFT 10
|
|
|
|
#define BXT_MIPI_DIV_SHIFT(port) \
|
|
|
|
_MIPI_PORT(port, BXT_MIPI1_DIV_SHIFT, \
|
|
|
|
BXT_MIPI2_DIV_SHIFT)
|
2016-02-15 17:13:57 +00:00
|
|
|
|
2015-09-23 17:57:17 +00:00
|
|
|
/* TX control divider to select actual TX clock output from (8x/var) */
|
2016-02-15 17:13:57 +00:00
|
|
|
#define BXT_MIPI1_TX_ESCLK_SHIFT 26
|
|
|
|
#define BXT_MIPI2_TX_ESCLK_SHIFT 10
|
2015-09-23 17:57:17 +00:00
|
|
|
#define BXT_MIPI_TX_ESCLK_SHIFT(port) \
|
|
|
|
_MIPI_PORT(port, BXT_MIPI1_TX_ESCLK_SHIFT, \
|
|
|
|
BXT_MIPI2_TX_ESCLK_SHIFT)
|
2016-02-15 17:13:57 +00:00
|
|
|
#define BXT_MIPI1_TX_ESCLK_FIXDIV_MASK (0x3F << 26)
|
|
|
|
#define BXT_MIPI2_TX_ESCLK_FIXDIV_MASK (0x3F << 10)
|
2015-09-23 17:57:17 +00:00
|
|
|
#define BXT_MIPI_TX_ESCLK_FIXDIV_MASK(port) \
|
|
|
|
_MIPI_PORT(port, BXT_MIPI1_TX_ESCLK_FIXDIV_MASK, \
|
2016-02-15 17:13:57 +00:00
|
|
|
BXT_MIPI2_TX_ESCLK_FIXDIV_MASK)
|
|
|
|
#define BXT_MIPI_TX_ESCLK_DIVIDER(port, val) \
|
|
|
|
((val & 0x3F) << BXT_MIPI_TX_ESCLK_SHIFT(port))
|
|
|
|
/* RX upper control divider to select actual RX clock output from 8x */
|
|
|
|
#define BXT_MIPI1_RX_ESCLK_UPPER_SHIFT 21
|
|
|
|
#define BXT_MIPI2_RX_ESCLK_UPPER_SHIFT 5
|
|
|
|
#define BXT_MIPI_RX_ESCLK_UPPER_SHIFT(port) \
|
|
|
|
_MIPI_PORT(port, BXT_MIPI1_RX_ESCLK_UPPER_SHIFT, \
|
|
|
|
BXT_MIPI2_RX_ESCLK_UPPER_SHIFT)
|
|
|
|
#define BXT_MIPI1_RX_ESCLK_UPPER_FIXDIV_MASK (3 << 21)
|
|
|
|
#define BXT_MIPI2_RX_ESCLK_UPPER_FIXDIV_MASK (3 << 5)
|
|
|
|
#define BXT_MIPI_RX_ESCLK_UPPER_FIXDIV_MASK(port) \
|
|
|
|
_MIPI_PORT(port, BXT_MIPI1_RX_ESCLK_UPPER_FIXDIV_MASK, \
|
|
|
|
BXT_MIPI2_RX_ESCLK_UPPER_FIXDIV_MASK)
|
|
|
|
#define BXT_MIPI_RX_ESCLK_UPPER_DIVIDER(port, val) \
|
|
|
|
((val & 3) << BXT_MIPI_RX_ESCLK_UPPER_SHIFT(port))
|
|
|
|
/* 8/3X divider to select the actual 8/3X clock output from 8x */
|
|
|
|
#define BXT_MIPI1_8X_BY3_SHIFT 19
|
|
|
|
#define BXT_MIPI2_8X_BY3_SHIFT 3
|
|
|
|
#define BXT_MIPI_8X_BY3_SHIFT(port) \
|
|
|
|
_MIPI_PORT(port, BXT_MIPI1_8X_BY3_SHIFT, \
|
|
|
|
BXT_MIPI2_8X_BY3_SHIFT)
|
|
|
|
#define BXT_MIPI1_8X_BY3_DIVIDER_MASK (3 << 19)
|
|
|
|
#define BXT_MIPI2_8X_BY3_DIVIDER_MASK (3 << 3)
|
|
|
|
#define BXT_MIPI_8X_BY3_DIVIDER_MASK(port) \
|
|
|
|
_MIPI_PORT(port, BXT_MIPI1_8X_BY3_DIVIDER_MASK, \
|
|
|
|
BXT_MIPI2_8X_BY3_DIVIDER_MASK)
|
|
|
|
#define BXT_MIPI_8X_BY3_DIVIDER(port, val) \
|
|
|
|
((val & 3) << BXT_MIPI_8X_BY3_SHIFT(port))
|
|
|
|
/* RX lower control divider to select actual RX clock output from 8x */
|
|
|
|
#define BXT_MIPI1_RX_ESCLK_LOWER_SHIFT 16
|
|
|
|
#define BXT_MIPI2_RX_ESCLK_LOWER_SHIFT 0
|
|
|
|
#define BXT_MIPI_RX_ESCLK_LOWER_SHIFT(port) \
|
|
|
|
_MIPI_PORT(port, BXT_MIPI1_RX_ESCLK_LOWER_SHIFT, \
|
|
|
|
BXT_MIPI2_RX_ESCLK_LOWER_SHIFT)
|
|
|
|
#define BXT_MIPI1_RX_ESCLK_LOWER_FIXDIV_MASK (3 << 16)
|
|
|
|
#define BXT_MIPI2_RX_ESCLK_LOWER_FIXDIV_MASK (3 << 0)
|
|
|
|
#define BXT_MIPI_RX_ESCLK_LOWER_FIXDIV_MASK(port) \
|
|
|
|
_MIPI_PORT(port, BXT_MIPI1_RX_ESCLK_LOWER_FIXDIV_MASK, \
|
|
|
|
BXT_MIPI2_RX_ESCLK_LOWER_FIXDIV_MASK)
|
|
|
|
#define BXT_MIPI_RX_ESCLK_LOWER_DIVIDER(port, val) \
|
|
|
|
((val & 3) << BXT_MIPI_RX_ESCLK_LOWER_SHIFT(port))
|
|
|
|
|
|
|
|
#define RX_DIVIDER_BIT_1_2 0x3
|
|
|
|
#define RX_DIVIDER_BIT_3_4 0xC
|
2015-09-23 17:57:17 +00:00
|
|
|
|
2015-09-01 14:11:40 +00:00
|
|
|
/* BXT MIPI mode configure */
|
|
|
|
#define _BXT_MIPIA_TRANS_HACTIVE 0x6B0F8
|
|
|
|
#define _BXT_MIPIC_TRANS_HACTIVE 0x6B8F8
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define BXT_MIPI_TRANS_HACTIVE(tc) _MMIO_MIPI(tc, \
|
2015-09-01 14:11:40 +00:00
|
|
|
_BXT_MIPIA_TRANS_HACTIVE, _BXT_MIPIC_TRANS_HACTIVE)
|
|
|
|
|
|
|
|
#define _BXT_MIPIA_TRANS_VACTIVE 0x6B0FC
|
|
|
|
#define _BXT_MIPIC_TRANS_VACTIVE 0x6B8FC
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define BXT_MIPI_TRANS_VACTIVE(tc) _MMIO_MIPI(tc, \
|
2015-09-01 14:11:40 +00:00
|
|
|
_BXT_MIPIA_TRANS_VACTIVE, _BXT_MIPIC_TRANS_VACTIVE)
|
|
|
|
|
|
|
|
#define _BXT_MIPIA_TRANS_VTOTAL 0x6B100
|
|
|
|
#define _BXT_MIPIC_TRANS_VTOTAL 0x6B900
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define BXT_MIPI_TRANS_VTOTAL(tc) _MMIO_MIPI(tc, \
|
2015-09-01 14:11:40 +00:00
|
|
|
_BXT_MIPIA_TRANS_VTOTAL, _BXT_MIPIC_TRANS_VTOTAL)
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define BXT_DSI_PLL_CTL _MMIO(0x161000)
|
2015-09-01 14:11:38 +00:00
|
|
|
#define BXT_DSI_PLL_PVD_RATIO_SHIFT 16
|
|
|
|
#define BXT_DSI_PLL_PVD_RATIO_MASK (3 << BXT_DSI_PLL_PVD_RATIO_SHIFT)
|
|
|
|
#define BXT_DSI_PLL_PVD_RATIO_1 (1 << BXT_DSI_PLL_PVD_RATIO_SHIFT)
|
|
|
|
#define BXT_DSIC_16X_BY2 (1 << 10)
|
|
|
|
#define BXT_DSIC_16X_BY3 (2 << 10)
|
|
|
|
#define BXT_DSIC_16X_BY4 (3 << 10)
|
2016-03-24 10:41:40 +00:00
|
|
|
#define BXT_DSIC_16X_MASK (3 << 10)
|
2015-09-01 14:11:38 +00:00
|
|
|
#define BXT_DSIA_16X_BY2 (1 << 8)
|
|
|
|
#define BXT_DSIA_16X_BY3 (2 << 8)
|
|
|
|
#define BXT_DSIA_16X_BY4 (3 << 8)
|
2016-03-24 10:41:40 +00:00
|
|
|
#define BXT_DSIA_16X_MASK (3 << 8)
|
2015-09-01 14:11:38 +00:00
|
|
|
#define BXT_DSI_FREQ_SEL_SHIFT 8
|
|
|
|
#define BXT_DSI_FREQ_SEL_MASK (0xF << BXT_DSI_FREQ_SEL_SHIFT)
|
|
|
|
|
|
|
|
#define BXT_DSI_PLL_RATIO_MAX 0x7D
|
|
|
|
#define BXT_DSI_PLL_RATIO_MIN 0x22
|
|
|
|
#define BXT_DSI_PLL_RATIO_MASK 0xFF
|
2015-12-04 14:17:38 +00:00
|
|
|
#define BXT_REF_CLOCK_KHZ 19200
|
2015-09-01 14:11:38 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define BXT_DSI_PLL_ENABLE _MMIO(0x46080)
|
2015-09-01 14:11:38 +00:00
|
|
|
#define BXT_DSI_PLL_DO_ENABLE (1 << 31)
|
|
|
|
#define BXT_DSI_PLL_LOCKED (1 << 30)
|
|
|
|
|
2013-08-27 12:12:16 +00:00
|
|
|
#define _MIPIA_PORT_CTRL (VLV_DISPLAY_BASE + 0x61190)
|
2014-11-14 14:54:21 +00:00
|
|
|
#define _MIPIC_PORT_CTRL (VLV_DISPLAY_BASE + 0x61700)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define MIPI_PORT_CTRL(port) _MMIO_MIPI(port, _MIPIA_PORT_CTRL, _MIPIC_PORT_CTRL)
|
2015-09-01 14:11:42 +00:00
|
|
|
|
|
|
|
/* BXT port control */
|
|
|
|
#define _BXT_MIPIA_PORT_CTRL 0x6B0C0
|
|
|
|
#define _BXT_MIPIC_PORT_CTRL 0x6B8C0
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define BXT_MIPI_PORT_CTRL(tc) _MMIO_MIPI(tc, _BXT_MIPIA_PORT_CTRL, _BXT_MIPIC_PORT_CTRL)
|
2015-09-01 14:11:42 +00:00
|
|
|
|
2014-11-14 14:54:21 +00:00
|
|
|
#define DPI_ENABLE (1 << 31) /* A + C */
|
2013-08-27 12:12:16 +00:00
|
|
|
#define MIPIA_MIPI4DPHY_DELAY_COUNT_SHIFT 27
|
|
|
|
#define MIPIA_MIPI4DPHY_DELAY_COUNT_MASK (0xf << 27)
|
2014-12-05 08:39:28 +00:00
|
|
|
#define DUAL_LINK_MODE_SHIFT 26
|
2013-08-27 12:12:16 +00:00
|
|
|
#define DUAL_LINK_MODE_MASK (1 << 26)
|
|
|
|
#define DUAL_LINK_MODE_FRONT_BACK (0 << 26)
|
|
|
|
#define DUAL_LINK_MODE_PIXEL_ALTERNATIVE (1 << 26)
|
2014-11-14 14:54:21 +00:00
|
|
|
#define DITHERING_ENABLE (1 << 25) /* A + C */
|
2013-08-27 12:12:16 +00:00
|
|
|
#define FLOPPED_HSTX (1 << 23)
|
|
|
|
#define DE_INVERT (1 << 19) /* XXX */
|
|
|
|
#define MIPIA_FLISDSI_DELAY_COUNT_SHIFT 18
|
|
|
|
#define MIPIA_FLISDSI_DELAY_COUNT_MASK (0xf << 18)
|
|
|
|
#define AFE_LATCHOUT (1 << 17)
|
|
|
|
#define LP_OUTPUT_HOLD (1 << 16)
|
2014-11-14 14:54:21 +00:00
|
|
|
#define MIPIC_FLISDSI_DELAY_COUNT_HIGH_SHIFT 15
|
|
|
|
#define MIPIC_FLISDSI_DELAY_COUNT_HIGH_MASK (1 << 15)
|
|
|
|
#define MIPIC_MIPI4DPHY_DELAY_COUNT_SHIFT 11
|
|
|
|
#define MIPIC_MIPI4DPHY_DELAY_COUNT_MASK (0xf << 11)
|
2013-08-27 12:12:16 +00:00
|
|
|
#define CSB_SHIFT 9
|
|
|
|
#define CSB_MASK (3 << 9)
|
|
|
|
#define CSB_20MHZ (0 << 9)
|
|
|
|
#define CSB_10MHZ (1 << 9)
|
|
|
|
#define CSB_40MHZ (2 << 9)
|
|
|
|
#define BANDGAP_MASK (1 << 8)
|
|
|
|
#define BANDGAP_PNW_CIRCUIT (0 << 8)
|
|
|
|
#define BANDGAP_LNC_CIRCUIT (1 << 8)
|
2014-11-14 14:54:21 +00:00
|
|
|
#define MIPIC_FLISDSI_DELAY_COUNT_LOW_SHIFT 5
|
|
|
|
#define MIPIC_FLISDSI_DELAY_COUNT_LOW_MASK (7 << 5)
|
|
|
|
#define TEARING_EFFECT_DELAY (1 << 4) /* A + C */
|
|
|
|
#define TEARING_EFFECT_SHIFT 2 /* A + C */
|
2013-08-27 12:12:16 +00:00
|
|
|
#define TEARING_EFFECT_MASK (3 << 2)
|
|
|
|
#define TEARING_EFFECT_OFF (0 << 2)
|
|
|
|
#define TEARING_EFFECT_DSI (1 << 2)
|
|
|
|
#define TEARING_EFFECT_GPIO (2 << 2)
|
|
|
|
#define LANE_CONFIGURATION_SHIFT 0
|
|
|
|
#define LANE_CONFIGURATION_MASK (3 << 0)
|
|
|
|
#define LANE_CONFIGURATION_4LANE (0 << 0)
|
|
|
|
#define LANE_CONFIGURATION_DUAL_LINK_A (1 << 0)
|
|
|
|
#define LANE_CONFIGURATION_DUAL_LINK_B (2 << 0)
|
|
|
|
|
|
|
|
#define _MIPIA_TEARING_CTRL (VLV_DISPLAY_BASE + 0x61194)
|
2014-11-14 14:54:21 +00:00
|
|
|
#define _MIPIC_TEARING_CTRL (VLV_DISPLAY_BASE + 0x61704)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define MIPI_TEARING_CTRL(port) _MMIO_MIPI(port, _MIPIA_TEARING_CTRL, _MIPIC_TEARING_CTRL)
|
2013-08-27 12:12:16 +00:00
|
|
|
#define TEARING_EFFECT_DELAY_SHIFT 0
|
|
|
|
#define TEARING_EFFECT_DELAY_MASK (0xffff << 0)
|
|
|
|
|
|
|
|
/* XXX: all bits reserved */
|
2014-06-02 12:37:47 +00:00
|
|
|
#define _MIPIA_AUTOPWG (VLV_DISPLAY_BASE + 0x611a0)
|
2013-08-27 12:12:16 +00:00
|
|
|
|
|
|
|
/* MIPI DSI Controller and D-PHY registers */
|
|
|
|
|
2014-06-02 12:37:47 +00:00
|
|
|
#define _MIPIA_DEVICE_READY (dev_priv->mipi_mmio_base + 0xb000)
|
2014-11-14 14:54:21 +00:00
|
|
|
#define _MIPIC_DEVICE_READY (dev_priv->mipi_mmio_base + 0xb800)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define MIPI_DEVICE_READY(port) _MMIO_MIPI(port, _MIPIA_DEVICE_READY, _MIPIC_DEVICE_READY)
|
2013-08-27 12:12:16 +00:00
|
|
|
#define BUS_POSSESSION (1 << 3) /* set to give bus to receiver */
|
|
|
|
#define ULPS_STATE_MASK (3 << 1)
|
|
|
|
#define ULPS_STATE_ENTER (2 << 1)
|
|
|
|
#define ULPS_STATE_EXIT (1 << 1)
|
|
|
|
#define ULPS_STATE_NORMAL_OPERATION (0 << 1)
|
|
|
|
#define DEVICE_READY (1 << 0)
|
|
|
|
|
2014-06-02 12:37:47 +00:00
|
|
|
#define _MIPIA_INTR_STAT (dev_priv->mipi_mmio_base + 0xb004)
|
2014-11-14 14:54:21 +00:00
|
|
|
#define _MIPIC_INTR_STAT (dev_priv->mipi_mmio_base + 0xb804)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define MIPI_INTR_STAT(port) _MMIO_MIPI(port, _MIPIA_INTR_STAT, _MIPIC_INTR_STAT)
|
2014-06-02 12:37:47 +00:00
|
|
|
#define _MIPIA_INTR_EN (dev_priv->mipi_mmio_base + 0xb008)
|
2014-11-14 14:54:21 +00:00
|
|
|
#define _MIPIC_INTR_EN (dev_priv->mipi_mmio_base + 0xb808)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define MIPI_INTR_EN(port) _MMIO_MIPI(port, _MIPIA_INTR_EN, _MIPIC_INTR_EN)
|
2013-08-27 12:12:16 +00:00
|
|
|
#define TEARING_EFFECT (1 << 31)
|
|
|
|
#define SPL_PKT_SENT_INTERRUPT (1 << 30)
|
|
|
|
#define GEN_READ_DATA_AVAIL (1 << 29)
|
|
|
|
#define LP_GENERIC_WR_FIFO_FULL (1 << 28)
|
|
|
|
#define HS_GENERIC_WR_FIFO_FULL (1 << 27)
|
|
|
|
#define RX_PROT_VIOLATION (1 << 26)
|
|
|
|
#define RX_INVALID_TX_LENGTH (1 << 25)
|
|
|
|
#define ACK_WITH_NO_ERROR (1 << 24)
|
|
|
|
#define TURN_AROUND_ACK_TIMEOUT (1 << 23)
|
|
|
|
#define LP_RX_TIMEOUT (1 << 22)
|
|
|
|
#define HS_TX_TIMEOUT (1 << 21)
|
|
|
|
#define DPI_FIFO_UNDERRUN (1 << 20)
|
|
|
|
#define LOW_CONTENTION (1 << 19)
|
|
|
|
#define HIGH_CONTENTION (1 << 18)
|
|
|
|
#define TXDSI_VC_ID_INVALID (1 << 17)
|
|
|
|
#define TXDSI_DATA_TYPE_NOT_RECOGNISED (1 << 16)
|
|
|
|
#define TXCHECKSUM_ERROR (1 << 15)
|
|
|
|
#define TXECC_MULTIBIT_ERROR (1 << 14)
|
|
|
|
#define TXECC_SINGLE_BIT_ERROR (1 << 13)
|
|
|
|
#define TXFALSE_CONTROL_ERROR (1 << 12)
|
|
|
|
#define RXDSI_VC_ID_INVALID (1 << 11)
|
|
|
|
#define RXDSI_DATA_TYPE_NOT_REGOGNISED (1 << 10)
|
|
|
|
#define RXCHECKSUM_ERROR (1 << 9)
|
|
|
|
#define RXECC_MULTIBIT_ERROR (1 << 8)
|
|
|
|
#define RXECC_SINGLE_BIT_ERROR (1 << 7)
|
|
|
|
#define RXFALSE_CONTROL_ERROR (1 << 6)
|
|
|
|
#define RXHS_RECEIVE_TIMEOUT_ERROR (1 << 5)
|
|
|
|
#define RX_LP_TX_SYNC_ERROR (1 << 4)
|
|
|
|
#define RXEXCAPE_MODE_ENTRY_ERROR (1 << 3)
|
|
|
|
#define RXEOT_SYNC_ERROR (1 << 2)
|
|
|
|
#define RXSOT_SYNC_ERROR (1 << 1)
|
|
|
|
#define RXSOT_ERROR (1 << 0)
|
|
|
|
|
2014-06-02 12:37:47 +00:00
|
|
|
#define _MIPIA_DSI_FUNC_PRG (dev_priv->mipi_mmio_base + 0xb00c)
|
2014-11-14 14:54:21 +00:00
|
|
|
#define _MIPIC_DSI_FUNC_PRG (dev_priv->mipi_mmio_base + 0xb80c)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define MIPI_DSI_FUNC_PRG(port) _MMIO_MIPI(port, _MIPIA_DSI_FUNC_PRG, _MIPIC_DSI_FUNC_PRG)
|
2013-08-27 12:12:16 +00:00
|
|
|
#define CMD_MODE_DATA_WIDTH_MASK (7 << 13)
|
|
|
|
#define CMD_MODE_NOT_SUPPORTED (0 << 13)
|
|
|
|
#define CMD_MODE_DATA_WIDTH_16_BIT (1 << 13)
|
|
|
|
#define CMD_MODE_DATA_WIDTH_9_BIT (2 << 13)
|
|
|
|
#define CMD_MODE_DATA_WIDTH_8_BIT (3 << 13)
|
|
|
|
#define CMD_MODE_DATA_WIDTH_OPTION1 (4 << 13)
|
|
|
|
#define CMD_MODE_DATA_WIDTH_OPTION2 (5 << 13)
|
|
|
|
#define VID_MODE_FORMAT_MASK (0xf << 7)
|
|
|
|
#define VID_MODE_NOT_SUPPORTED (0 << 7)
|
|
|
|
#define VID_MODE_FORMAT_RGB565 (1 << 7)
|
2016-03-16 10:21:39 +00:00
|
|
|
#define VID_MODE_FORMAT_RGB666_PACKED (2 << 7)
|
|
|
|
#define VID_MODE_FORMAT_RGB666 (3 << 7)
|
2013-08-27 12:12:16 +00:00
|
|
|
#define VID_MODE_FORMAT_RGB888 (4 << 7)
|
|
|
|
#define CMD_MODE_CHANNEL_NUMBER_SHIFT 5
|
|
|
|
#define CMD_MODE_CHANNEL_NUMBER_MASK (3 << 5)
|
|
|
|
#define VID_MODE_CHANNEL_NUMBER_SHIFT 3
|
|
|
|
#define VID_MODE_CHANNEL_NUMBER_MASK (3 << 3)
|
|
|
|
#define DATA_LANES_PRG_REG_SHIFT 0
|
|
|
|
#define DATA_LANES_PRG_REG_MASK (7 << 0)
|
|
|
|
|
2014-06-02 12:37:47 +00:00
|
|
|
#define _MIPIA_HS_TX_TIMEOUT (dev_priv->mipi_mmio_base + 0xb010)
|
2014-11-14 14:54:21 +00:00
|
|
|
#define _MIPIC_HS_TX_TIMEOUT (dev_priv->mipi_mmio_base + 0xb810)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define MIPI_HS_TX_TIMEOUT(port) _MMIO_MIPI(port, _MIPIA_HS_TX_TIMEOUT, _MIPIC_HS_TX_TIMEOUT)
|
2013-08-27 12:12:16 +00:00
|
|
|
#define HIGH_SPEED_TX_TIMEOUT_COUNTER_MASK 0xffffff
|
|
|
|
|
2014-06-02 12:37:47 +00:00
|
|
|
#define _MIPIA_LP_RX_TIMEOUT (dev_priv->mipi_mmio_base + 0xb014)
|
2014-11-14 14:54:21 +00:00
|
|
|
#define _MIPIC_LP_RX_TIMEOUT (dev_priv->mipi_mmio_base + 0xb814)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define MIPI_LP_RX_TIMEOUT(port) _MMIO_MIPI(port, _MIPIA_LP_RX_TIMEOUT, _MIPIC_LP_RX_TIMEOUT)
|
2013-08-27 12:12:16 +00:00
|
|
|
#define LOW_POWER_RX_TIMEOUT_COUNTER_MASK 0xffffff
|
|
|
|
|
2014-06-02 12:37:47 +00:00
|
|
|
#define _MIPIA_TURN_AROUND_TIMEOUT (dev_priv->mipi_mmio_base + 0xb018)
|
2014-11-14 14:54:21 +00:00
|
|
|
#define _MIPIC_TURN_AROUND_TIMEOUT (dev_priv->mipi_mmio_base + 0xb818)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define MIPI_TURN_AROUND_TIMEOUT(port) _MMIO_MIPI(port, _MIPIA_TURN_AROUND_TIMEOUT, _MIPIC_TURN_AROUND_TIMEOUT)
|
2013-08-27 12:12:16 +00:00
|
|
|
#define TURN_AROUND_TIMEOUT_MASK 0x3f
|
|
|
|
|
2014-06-02 12:37:47 +00:00
|
|
|
#define _MIPIA_DEVICE_RESET_TIMER (dev_priv->mipi_mmio_base + 0xb01c)
|
2014-11-14 14:54:21 +00:00
|
|
|
#define _MIPIC_DEVICE_RESET_TIMER (dev_priv->mipi_mmio_base + 0xb81c)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define MIPI_DEVICE_RESET_TIMER(port) _MMIO_MIPI(port, _MIPIA_DEVICE_RESET_TIMER, _MIPIC_DEVICE_RESET_TIMER)
|
2013-08-27 12:12:16 +00:00
|
|
|
#define DEVICE_RESET_TIMER_MASK 0xffff
|
|
|
|
|
2014-06-02 12:37:47 +00:00
|
|
|
#define _MIPIA_DPI_RESOLUTION (dev_priv->mipi_mmio_base + 0xb020)
|
2014-11-14 14:54:21 +00:00
|
|
|
#define _MIPIC_DPI_RESOLUTION (dev_priv->mipi_mmio_base + 0xb820)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define MIPI_DPI_RESOLUTION(port) _MMIO_MIPI(port, _MIPIA_DPI_RESOLUTION, _MIPIC_DPI_RESOLUTION)
|
2013-08-27 12:12:16 +00:00
|
|
|
#define VERTICAL_ADDRESS_SHIFT 16
|
|
|
|
#define VERTICAL_ADDRESS_MASK (0xffff << 16)
|
|
|
|
#define HORIZONTAL_ADDRESS_SHIFT 0
|
|
|
|
#define HORIZONTAL_ADDRESS_MASK 0xffff
|
|
|
|
|
2014-06-02 12:37:47 +00:00
|
|
|
#define _MIPIA_DBI_FIFO_THROTTLE (dev_priv->mipi_mmio_base + 0xb024)
|
2014-11-14 14:54:21 +00:00
|
|
|
#define _MIPIC_DBI_FIFO_THROTTLE (dev_priv->mipi_mmio_base + 0xb824)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define MIPI_DBI_FIFO_THROTTLE(port) _MMIO_MIPI(port, _MIPIA_DBI_FIFO_THROTTLE, _MIPIC_DBI_FIFO_THROTTLE)
|
2013-08-27 12:12:16 +00:00
|
|
|
#define DBI_FIFO_EMPTY_HALF (0 << 0)
|
|
|
|
#define DBI_FIFO_EMPTY_QUARTER (1 << 0)
|
|
|
|
#define DBI_FIFO_EMPTY_7_LOCATIONS (2 << 0)
|
|
|
|
|
|
|
|
/* regs below are bits 15:0 */
|
2014-06-02 12:37:47 +00:00
|
|
|
#define _MIPIA_HSYNC_PADDING_COUNT (dev_priv->mipi_mmio_base + 0xb028)
|
2014-11-14 14:54:21 +00:00
|
|
|
#define _MIPIC_HSYNC_PADDING_COUNT (dev_priv->mipi_mmio_base + 0xb828)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define MIPI_HSYNC_PADDING_COUNT(port) _MMIO_MIPI(port, _MIPIA_HSYNC_PADDING_COUNT, _MIPIC_HSYNC_PADDING_COUNT)
|
2013-08-27 12:12:16 +00:00
|
|
|
|
2014-06-02 12:37:47 +00:00
|
|
|
#define _MIPIA_HBP_COUNT (dev_priv->mipi_mmio_base + 0xb02c)
|
2014-11-14 14:54:21 +00:00
|
|
|
#define _MIPIC_HBP_COUNT (dev_priv->mipi_mmio_base + 0xb82c)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define MIPI_HBP_COUNT(port) _MMIO_MIPI(port, _MIPIA_HBP_COUNT, _MIPIC_HBP_COUNT)
|
2013-08-27 12:12:16 +00:00
|
|
|
|
2014-06-02 12:37:47 +00:00
|
|
|
#define _MIPIA_HFP_COUNT (dev_priv->mipi_mmio_base + 0xb030)
|
2014-11-14 14:54:21 +00:00
|
|
|
#define _MIPIC_HFP_COUNT (dev_priv->mipi_mmio_base + 0xb830)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define MIPI_HFP_COUNT(port) _MMIO_MIPI(port, _MIPIA_HFP_COUNT, _MIPIC_HFP_COUNT)
|
2013-08-27 12:12:16 +00:00
|
|
|
|
2014-06-02 12:37:47 +00:00
|
|
|
#define _MIPIA_HACTIVE_AREA_COUNT (dev_priv->mipi_mmio_base + 0xb034)
|
2014-11-14 14:54:21 +00:00
|
|
|
#define _MIPIC_HACTIVE_AREA_COUNT (dev_priv->mipi_mmio_base + 0xb834)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define MIPI_HACTIVE_AREA_COUNT(port) _MMIO_MIPI(port, _MIPIA_HACTIVE_AREA_COUNT, _MIPIC_HACTIVE_AREA_COUNT)
|
2013-08-27 12:12:16 +00:00
|
|
|
|
2014-06-02 12:37:47 +00:00
|
|
|
#define _MIPIA_VSYNC_PADDING_COUNT (dev_priv->mipi_mmio_base + 0xb038)
|
2014-11-14 14:54:21 +00:00
|
|
|
#define _MIPIC_VSYNC_PADDING_COUNT (dev_priv->mipi_mmio_base + 0xb838)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define MIPI_VSYNC_PADDING_COUNT(port) _MMIO_MIPI(port, _MIPIA_VSYNC_PADDING_COUNT, _MIPIC_VSYNC_PADDING_COUNT)
|
2013-08-27 12:12:16 +00:00
|
|
|
|
2014-06-02 12:37:47 +00:00
|
|
|
#define _MIPIA_VBP_COUNT (dev_priv->mipi_mmio_base + 0xb03c)
|
2014-11-14 14:54:21 +00:00
|
|
|
#define _MIPIC_VBP_COUNT (dev_priv->mipi_mmio_base + 0xb83c)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define MIPI_VBP_COUNT(port) _MMIO_MIPI(port, _MIPIA_VBP_COUNT, _MIPIC_VBP_COUNT)
|
2013-08-27 12:12:16 +00:00
|
|
|
|
2014-06-02 12:37:47 +00:00
|
|
|
#define _MIPIA_VFP_COUNT (dev_priv->mipi_mmio_base + 0xb040)
|
2014-11-14 14:54:21 +00:00
|
|
|
#define _MIPIC_VFP_COUNT (dev_priv->mipi_mmio_base + 0xb840)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define MIPI_VFP_COUNT(port) _MMIO_MIPI(port, _MIPIA_VFP_COUNT, _MIPIC_VFP_COUNT)
|
2013-08-27 12:12:16 +00:00
|
|
|
|
2014-06-02 12:37:47 +00:00
|
|
|
#define _MIPIA_HIGH_LOW_SWITCH_COUNT (dev_priv->mipi_mmio_base + 0xb044)
|
2014-11-14 14:54:21 +00:00
|
|
|
#define _MIPIC_HIGH_LOW_SWITCH_COUNT (dev_priv->mipi_mmio_base + 0xb844)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define MIPI_HIGH_LOW_SWITCH_COUNT(port) _MMIO_MIPI(port, _MIPIA_HIGH_LOW_SWITCH_COUNT, _MIPIC_HIGH_LOW_SWITCH_COUNT)
|
2014-06-02 12:37:47 +00:00
|
|
|
|
2013-08-27 12:12:16 +00:00
|
|
|
/* regs above are bits 15:0 */
|
|
|
|
|
2014-06-02 12:37:47 +00:00
|
|
|
#define _MIPIA_DPI_CONTROL (dev_priv->mipi_mmio_base + 0xb048)
|
2014-11-14 14:54:21 +00:00
|
|
|
#define _MIPIC_DPI_CONTROL (dev_priv->mipi_mmio_base + 0xb848)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define MIPI_DPI_CONTROL(port) _MMIO_MIPI(port, _MIPIA_DPI_CONTROL, _MIPIC_DPI_CONTROL)
|
2013-08-27 12:12:16 +00:00
|
|
|
#define DPI_LP_MODE (1 << 6)
|
|
|
|
#define BACKLIGHT_OFF (1 << 5)
|
|
|
|
#define BACKLIGHT_ON (1 << 4)
|
|
|
|
#define COLOR_MODE_OFF (1 << 3)
|
|
|
|
#define COLOR_MODE_ON (1 << 2)
|
|
|
|
#define TURN_ON (1 << 1)
|
|
|
|
#define SHUTDOWN (1 << 0)
|
|
|
|
|
2014-06-02 12:37:47 +00:00
|
|
|
#define _MIPIA_DPI_DATA (dev_priv->mipi_mmio_base + 0xb04c)
|
2014-11-14 14:54:21 +00:00
|
|
|
#define _MIPIC_DPI_DATA (dev_priv->mipi_mmio_base + 0xb84c)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define MIPI_DPI_DATA(port) _MMIO_MIPI(port, _MIPIA_DPI_DATA, _MIPIC_DPI_DATA)
|
2013-08-27 12:12:16 +00:00
|
|
|
#define COMMAND_BYTE_SHIFT 0
|
|
|
|
#define COMMAND_BYTE_MASK (0x3f << 0)
|
|
|
|
|
2014-06-02 12:37:47 +00:00
|
|
|
#define _MIPIA_INIT_COUNT (dev_priv->mipi_mmio_base + 0xb050)
|
2014-11-14 14:54:21 +00:00
|
|
|
#define _MIPIC_INIT_COUNT (dev_priv->mipi_mmio_base + 0xb850)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define MIPI_INIT_COUNT(port) _MMIO_MIPI(port, _MIPIA_INIT_COUNT, _MIPIC_INIT_COUNT)
|
2013-08-27 12:12:16 +00:00
|
|
|
#define MASTER_INIT_TIMER_SHIFT 0
|
|
|
|
#define MASTER_INIT_TIMER_MASK (0xffff << 0)
|
|
|
|
|
2014-06-02 12:37:47 +00:00
|
|
|
#define _MIPIA_MAX_RETURN_PKT_SIZE (dev_priv->mipi_mmio_base + 0xb054)
|
2014-11-14 14:54:21 +00:00
|
|
|
#define _MIPIC_MAX_RETURN_PKT_SIZE (dev_priv->mipi_mmio_base + 0xb854)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define MIPI_MAX_RETURN_PKT_SIZE(port) _MMIO_MIPI(port, \
|
2014-11-14 14:54:21 +00:00
|
|
|
_MIPIA_MAX_RETURN_PKT_SIZE, _MIPIC_MAX_RETURN_PKT_SIZE)
|
2013-08-27 12:12:16 +00:00
|
|
|
#define MAX_RETURN_PKT_SIZE_SHIFT 0
|
|
|
|
#define MAX_RETURN_PKT_SIZE_MASK (0x3ff << 0)
|
|
|
|
|
2014-06-02 12:37:47 +00:00
|
|
|
#define _MIPIA_VIDEO_MODE_FORMAT (dev_priv->mipi_mmio_base + 0xb058)
|
2014-11-14 14:54:21 +00:00
|
|
|
#define _MIPIC_VIDEO_MODE_FORMAT (dev_priv->mipi_mmio_base + 0xb858)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define MIPI_VIDEO_MODE_FORMAT(port) _MMIO_MIPI(port, _MIPIA_VIDEO_MODE_FORMAT, _MIPIC_VIDEO_MODE_FORMAT)
|
2013-08-27 12:12:16 +00:00
|
|
|
#define RANDOM_DPI_DISPLAY_RESOLUTION (1 << 4)
|
|
|
|
#define DISABLE_VIDEO_BTA (1 << 3)
|
|
|
|
#define IP_TG_CONFIG (1 << 2)
|
|
|
|
#define VIDEO_MODE_NON_BURST_WITH_SYNC_PULSE (1 << 0)
|
|
|
|
#define VIDEO_MODE_NON_BURST_WITH_SYNC_EVENTS (2 << 0)
|
|
|
|
#define VIDEO_MODE_BURST (3 << 0)
|
|
|
|
|
2014-06-02 12:37:47 +00:00
|
|
|
#define _MIPIA_EOT_DISABLE (dev_priv->mipi_mmio_base + 0xb05c)
|
2014-11-14 14:54:21 +00:00
|
|
|
#define _MIPIC_EOT_DISABLE (dev_priv->mipi_mmio_base + 0xb85c)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define MIPI_EOT_DISABLE(port) _MMIO_MIPI(port, _MIPIA_EOT_DISABLE, _MIPIC_EOT_DISABLE)
|
2013-08-27 12:12:16 +00:00
|
|
|
#define LP_RX_TIMEOUT_ERROR_RECOVERY_DISABLE (1 << 7)
|
|
|
|
#define HS_RX_TIMEOUT_ERROR_RECOVERY_DISABLE (1 << 6)
|
|
|
|
#define LOW_CONTENTION_RECOVERY_DISABLE (1 << 5)
|
|
|
|
#define HIGH_CONTENTION_RECOVERY_DISABLE (1 << 4)
|
|
|
|
#define TXDSI_TYPE_NOT_RECOGNISED_ERROR_RECOVERY_DISABLE (1 << 3)
|
|
|
|
#define TXECC_MULTIBIT_ERROR_RECOVERY_DISABLE (1 << 2)
|
|
|
|
#define CLOCKSTOP (1 << 1)
|
|
|
|
#define EOT_DISABLE (1 << 0)
|
|
|
|
|
2014-06-02 12:37:47 +00:00
|
|
|
#define _MIPIA_LP_BYTECLK (dev_priv->mipi_mmio_base + 0xb060)
|
2014-11-14 14:54:21 +00:00
|
|
|
#define _MIPIC_LP_BYTECLK (dev_priv->mipi_mmio_base + 0xb860)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define MIPI_LP_BYTECLK(port) _MMIO_MIPI(port, _MIPIA_LP_BYTECLK, _MIPIC_LP_BYTECLK)
|
2013-08-27 12:12:16 +00:00
|
|
|
#define LP_BYTECLK_SHIFT 0
|
|
|
|
#define LP_BYTECLK_MASK (0xffff << 0)
|
|
|
|
|
|
|
|
/* bits 31:0 */
|
2014-06-02 12:37:47 +00:00
|
|
|
#define _MIPIA_LP_GEN_DATA (dev_priv->mipi_mmio_base + 0xb064)
|
2014-11-14 14:54:21 +00:00
|
|
|
#define _MIPIC_LP_GEN_DATA (dev_priv->mipi_mmio_base + 0xb864)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define MIPI_LP_GEN_DATA(port) _MMIO_MIPI(port, _MIPIA_LP_GEN_DATA, _MIPIC_LP_GEN_DATA)
|
2013-08-27 12:12:16 +00:00
|
|
|
|
|
|
|
/* bits 31:0 */
|
2014-06-02 12:37:47 +00:00
|
|
|
#define _MIPIA_HS_GEN_DATA (dev_priv->mipi_mmio_base + 0xb068)
|
2014-11-14 14:54:21 +00:00
|
|
|
#define _MIPIC_HS_GEN_DATA (dev_priv->mipi_mmio_base + 0xb868)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define MIPI_HS_GEN_DATA(port) _MMIO_MIPI(port, _MIPIA_HS_GEN_DATA, _MIPIC_HS_GEN_DATA)
|
2013-08-27 12:12:16 +00:00
|
|
|
|
2014-06-02 12:37:47 +00:00
|
|
|
#define _MIPIA_LP_GEN_CTRL (dev_priv->mipi_mmio_base + 0xb06c)
|
2014-11-14 14:54:21 +00:00
|
|
|
#define _MIPIC_LP_GEN_CTRL (dev_priv->mipi_mmio_base + 0xb86c)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define MIPI_LP_GEN_CTRL(port) _MMIO_MIPI(port, _MIPIA_LP_GEN_CTRL, _MIPIC_LP_GEN_CTRL)
|
2014-06-02 12:37:47 +00:00
|
|
|
#define _MIPIA_HS_GEN_CTRL (dev_priv->mipi_mmio_base + 0xb070)
|
2014-11-14 14:54:21 +00:00
|
|
|
#define _MIPIC_HS_GEN_CTRL (dev_priv->mipi_mmio_base + 0xb870)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define MIPI_HS_GEN_CTRL(port) _MMIO_MIPI(port, _MIPIA_HS_GEN_CTRL, _MIPIC_HS_GEN_CTRL)
|
2013-08-27 12:12:16 +00:00
|
|
|
#define LONG_PACKET_WORD_COUNT_SHIFT 8
|
|
|
|
#define LONG_PACKET_WORD_COUNT_MASK (0xffff << 8)
|
|
|
|
#define SHORT_PACKET_PARAM_SHIFT 8
|
|
|
|
#define SHORT_PACKET_PARAM_MASK (0xffff << 8)
|
|
|
|
#define VIRTUAL_CHANNEL_SHIFT 6
|
|
|
|
#define VIRTUAL_CHANNEL_MASK (3 << 6)
|
|
|
|
#define DATA_TYPE_SHIFT 0
|
2015-09-18 17:03:40 +00:00
|
|
|
#define DATA_TYPE_MASK (0x3f << 0)
|
2013-08-27 12:12:16 +00:00
|
|
|
/* data type values, see include/video/mipi_display.h */
|
|
|
|
|
2014-06-02 12:37:47 +00:00
|
|
|
#define _MIPIA_GEN_FIFO_STAT (dev_priv->mipi_mmio_base + 0xb074)
|
2014-11-14 14:54:21 +00:00
|
|
|
#define _MIPIC_GEN_FIFO_STAT (dev_priv->mipi_mmio_base + 0xb874)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define MIPI_GEN_FIFO_STAT(port) _MMIO_MIPI(port, _MIPIA_GEN_FIFO_STAT, _MIPIC_GEN_FIFO_STAT)
|
2013-08-27 12:12:16 +00:00
|
|
|
#define DPI_FIFO_EMPTY (1 << 28)
|
|
|
|
#define DBI_FIFO_EMPTY (1 << 27)
|
|
|
|
#define LP_CTRL_FIFO_EMPTY (1 << 26)
|
|
|
|
#define LP_CTRL_FIFO_HALF_EMPTY (1 << 25)
|
|
|
|
#define LP_CTRL_FIFO_FULL (1 << 24)
|
|
|
|
#define HS_CTRL_FIFO_EMPTY (1 << 18)
|
|
|
|
#define HS_CTRL_FIFO_HALF_EMPTY (1 << 17)
|
|
|
|
#define HS_CTRL_FIFO_FULL (1 << 16)
|
|
|
|
#define LP_DATA_FIFO_EMPTY (1 << 10)
|
|
|
|
#define LP_DATA_FIFO_HALF_EMPTY (1 << 9)
|
|
|
|
#define LP_DATA_FIFO_FULL (1 << 8)
|
|
|
|
#define HS_DATA_FIFO_EMPTY (1 << 2)
|
|
|
|
#define HS_DATA_FIFO_HALF_EMPTY (1 << 1)
|
|
|
|
#define HS_DATA_FIFO_FULL (1 << 0)
|
|
|
|
|
2014-06-02 12:37:47 +00:00
|
|
|
#define _MIPIA_HS_LS_DBI_ENABLE (dev_priv->mipi_mmio_base + 0xb078)
|
2014-11-14 14:54:21 +00:00
|
|
|
#define _MIPIC_HS_LS_DBI_ENABLE (dev_priv->mipi_mmio_base + 0xb878)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define MIPI_HS_LP_DBI_ENABLE(port) _MMIO_MIPI(port, _MIPIA_HS_LS_DBI_ENABLE, _MIPIC_HS_LS_DBI_ENABLE)
|
2013-08-27 12:12:16 +00:00
|
|
|
#define DBI_HS_LP_MODE_MASK (1 << 0)
|
|
|
|
#define DBI_LP_MODE (1 << 0)
|
|
|
|
#define DBI_HS_MODE (0 << 0)
|
|
|
|
|
2014-06-02 12:37:47 +00:00
|
|
|
#define _MIPIA_DPHY_PARAM (dev_priv->mipi_mmio_base + 0xb080)
|
2014-11-14 14:54:21 +00:00
|
|
|
#define _MIPIC_DPHY_PARAM (dev_priv->mipi_mmio_base + 0xb880)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define MIPI_DPHY_PARAM(port) _MMIO_MIPI(port, _MIPIA_DPHY_PARAM, _MIPIC_DPHY_PARAM)
|
2013-08-27 12:12:16 +00:00
|
|
|
#define EXIT_ZERO_COUNT_SHIFT 24
|
|
|
|
#define EXIT_ZERO_COUNT_MASK (0x3f << 24)
|
|
|
|
#define TRAIL_COUNT_SHIFT 16
|
|
|
|
#define TRAIL_COUNT_MASK (0x1f << 16)
|
|
|
|
#define CLK_ZERO_COUNT_SHIFT 8
|
|
|
|
#define CLK_ZERO_COUNT_MASK (0xff << 8)
|
|
|
|
#define PREPARE_COUNT_SHIFT 0
|
|
|
|
#define PREPARE_COUNT_MASK (0x3f << 0)
|
|
|
|
|
|
|
|
/* bits 31:0 */
|
2014-06-02 12:37:47 +00:00
|
|
|
#define _MIPIA_DBI_BW_CTRL (dev_priv->mipi_mmio_base + 0xb084)
|
2014-11-14 14:54:21 +00:00
|
|
|
#define _MIPIC_DBI_BW_CTRL (dev_priv->mipi_mmio_base + 0xb884)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define MIPI_DBI_BW_CTRL(port) _MMIO_MIPI(port, _MIPIA_DBI_BW_CTRL, _MIPIC_DBI_BW_CTRL)
|
|
|
|
|
|
|
|
#define _MIPIA_CLK_LANE_SWITCH_TIME_CNT (dev_priv->mipi_mmio_base + 0xb088)
|
|
|
|
#define _MIPIC_CLK_LANE_SWITCH_TIME_CNT (dev_priv->mipi_mmio_base + 0xb888)
|
|
|
|
#define MIPI_CLK_LANE_SWITCH_TIME_CNT(port) _MMIO_MIPI(port, _MIPIA_CLK_LANE_SWITCH_TIME_CNT, _MIPIC_CLK_LANE_SWITCH_TIME_CNT)
|
2013-08-27 12:12:16 +00:00
|
|
|
#define LP_HS_SSW_CNT_SHIFT 16
|
|
|
|
#define LP_HS_SSW_CNT_MASK (0xffff << 16)
|
|
|
|
#define HS_LP_PWR_SW_CNT_SHIFT 0
|
|
|
|
#define HS_LP_PWR_SW_CNT_MASK (0xffff << 0)
|
|
|
|
|
2014-06-02 12:37:47 +00:00
|
|
|
#define _MIPIA_STOP_STATE_STALL (dev_priv->mipi_mmio_base + 0xb08c)
|
2014-11-14 14:54:21 +00:00
|
|
|
#define _MIPIC_STOP_STATE_STALL (dev_priv->mipi_mmio_base + 0xb88c)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define MIPI_STOP_STATE_STALL(port) _MMIO_MIPI(port, _MIPIA_STOP_STATE_STALL, _MIPIC_STOP_STATE_STALL)
|
2013-08-27 12:12:16 +00:00
|
|
|
#define STOP_STATE_STALL_COUNTER_SHIFT 0
|
|
|
|
#define STOP_STATE_STALL_COUNTER_MASK (0xff << 0)
|
|
|
|
|
2014-06-02 12:37:47 +00:00
|
|
|
#define _MIPIA_INTR_STAT_REG_1 (dev_priv->mipi_mmio_base + 0xb090)
|
2014-11-14 14:54:21 +00:00
|
|
|
#define _MIPIC_INTR_STAT_REG_1 (dev_priv->mipi_mmio_base + 0xb890)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define MIPI_INTR_STAT_REG_1(port) _MMIO_MIPI(port, _MIPIA_INTR_STAT_REG_1, _MIPIC_INTR_STAT_REG_1)
|
2014-06-02 12:37:47 +00:00
|
|
|
#define _MIPIA_INTR_EN_REG_1 (dev_priv->mipi_mmio_base + 0xb094)
|
2014-11-14 14:54:21 +00:00
|
|
|
#define _MIPIC_INTR_EN_REG_1 (dev_priv->mipi_mmio_base + 0xb894)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define MIPI_INTR_EN_REG_1(port) _MMIO_MIPI(port, _MIPIA_INTR_EN_REG_1, _MIPIC_INTR_EN_REG_1)
|
2013-08-27 12:12:16 +00:00
|
|
|
#define RX_CONTENTION_DETECTED (1 << 0)
|
|
|
|
|
|
|
|
/* XXX: only pipe A ?!? */
|
2014-06-02 12:37:47 +00:00
|
|
|
#define MIPIA_DBI_TYPEC_CTRL (dev_priv->mipi_mmio_base + 0xb100)
|
2013-08-27 12:12:16 +00:00
|
|
|
#define DBI_TYPEC_ENABLE (1 << 31)
|
|
|
|
#define DBI_TYPEC_WIP (1 << 30)
|
|
|
|
#define DBI_TYPEC_OPTION_SHIFT 28
|
|
|
|
#define DBI_TYPEC_OPTION_MASK (3 << 28)
|
|
|
|
#define DBI_TYPEC_FREQ_SHIFT 24
|
|
|
|
#define DBI_TYPEC_FREQ_MASK (0xf << 24)
|
|
|
|
#define DBI_TYPEC_OVERRIDE (1 << 8)
|
|
|
|
#define DBI_TYPEC_OVERRIDE_COUNTER_SHIFT 0
|
|
|
|
#define DBI_TYPEC_OVERRIDE_COUNTER_MASK (0xff << 0)
|
|
|
|
|
|
|
|
|
|
|
|
/* MIPI adapter registers */
|
|
|
|
|
2014-06-02 12:37:47 +00:00
|
|
|
#define _MIPIA_CTRL (dev_priv->mipi_mmio_base + 0xb104)
|
2014-11-14 14:54:21 +00:00
|
|
|
#define _MIPIC_CTRL (dev_priv->mipi_mmio_base + 0xb904)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define MIPI_CTRL(port) _MMIO_MIPI(port, _MIPIA_CTRL, _MIPIC_CTRL)
|
2013-08-27 12:12:16 +00:00
|
|
|
#define ESCAPE_CLOCK_DIVIDER_SHIFT 5 /* A only */
|
|
|
|
#define ESCAPE_CLOCK_DIVIDER_MASK (3 << 5)
|
|
|
|
#define ESCAPE_CLOCK_DIVIDER_1 (0 << 5)
|
|
|
|
#define ESCAPE_CLOCK_DIVIDER_2 (1 << 5)
|
|
|
|
#define ESCAPE_CLOCK_DIVIDER_4 (2 << 5)
|
|
|
|
#define READ_REQUEST_PRIORITY_SHIFT 3
|
|
|
|
#define READ_REQUEST_PRIORITY_MASK (3 << 3)
|
|
|
|
#define READ_REQUEST_PRIORITY_LOW (0 << 3)
|
|
|
|
#define READ_REQUEST_PRIORITY_HIGH (3 << 3)
|
|
|
|
#define RGB_FLIP_TO_BGR (1 << 2)
|
|
|
|
|
2016-03-15 19:51:12 +00:00
|
|
|
#define BXT_PIPE_SELECT_SHIFT 7
|
2015-09-01 14:11:40 +00:00
|
|
|
#define BXT_PIPE_SELECT_MASK (7 << 7)
|
2015-12-09 14:44:04 +00:00
|
|
|
#define BXT_PIPE_SELECT(pipe) ((pipe) << 7)
|
2015-09-01 14:11:40 +00:00
|
|
|
|
2014-06-02 12:37:47 +00:00
|
|
|
#define _MIPIA_DATA_ADDRESS (dev_priv->mipi_mmio_base + 0xb108)
|
2014-11-14 14:54:21 +00:00
|
|
|
#define _MIPIC_DATA_ADDRESS (dev_priv->mipi_mmio_base + 0xb908)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define MIPI_DATA_ADDRESS(port) _MMIO_MIPI(port, _MIPIA_DATA_ADDRESS, _MIPIC_DATA_ADDRESS)
|
2013-08-27 12:12:16 +00:00
|
|
|
#define DATA_MEM_ADDRESS_SHIFT 5
|
|
|
|
#define DATA_MEM_ADDRESS_MASK (0x7ffffff << 5)
|
|
|
|
#define DATA_VALID (1 << 0)
|
|
|
|
|
2014-06-02 12:37:47 +00:00
|
|
|
#define _MIPIA_DATA_LENGTH (dev_priv->mipi_mmio_base + 0xb10c)
|
2014-11-14 14:54:21 +00:00
|
|
|
#define _MIPIC_DATA_LENGTH (dev_priv->mipi_mmio_base + 0xb90c)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define MIPI_DATA_LENGTH(port) _MMIO_MIPI(port, _MIPIA_DATA_LENGTH, _MIPIC_DATA_LENGTH)
|
2013-08-27 12:12:16 +00:00
|
|
|
#define DATA_LENGTH_SHIFT 0
|
|
|
|
#define DATA_LENGTH_MASK (0xfffff << 0)
|
|
|
|
|
2014-06-02 12:37:47 +00:00
|
|
|
#define _MIPIA_COMMAND_ADDRESS (dev_priv->mipi_mmio_base + 0xb110)
|
2014-11-14 14:54:21 +00:00
|
|
|
#define _MIPIC_COMMAND_ADDRESS (dev_priv->mipi_mmio_base + 0xb910)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define MIPI_COMMAND_ADDRESS(port) _MMIO_MIPI(port, _MIPIA_COMMAND_ADDRESS, _MIPIC_COMMAND_ADDRESS)
|
2013-08-27 12:12:16 +00:00
|
|
|
#define COMMAND_MEM_ADDRESS_SHIFT 5
|
|
|
|
#define COMMAND_MEM_ADDRESS_MASK (0x7ffffff << 5)
|
|
|
|
#define AUTO_PWG_ENABLE (1 << 2)
|
|
|
|
#define MEMORY_WRITE_DATA_FROM_PIPE_RENDERING (1 << 1)
|
|
|
|
#define COMMAND_VALID (1 << 0)
|
|
|
|
|
2014-06-02 12:37:47 +00:00
|
|
|
#define _MIPIA_COMMAND_LENGTH (dev_priv->mipi_mmio_base + 0xb114)
|
2014-11-14 14:54:21 +00:00
|
|
|
#define _MIPIC_COMMAND_LENGTH (dev_priv->mipi_mmio_base + 0xb914)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define MIPI_COMMAND_LENGTH(port) _MMIO_MIPI(port, _MIPIA_COMMAND_LENGTH, _MIPIC_COMMAND_LENGTH)
|
2013-08-27 12:12:16 +00:00
|
|
|
#define COMMAND_LENGTH_SHIFT(n) (8 * (n)) /* n: 0...3 */
|
|
|
|
#define COMMAND_LENGTH_MASK(n) (0xff << (8 * (n)))
|
|
|
|
|
2014-06-02 12:37:47 +00:00
|
|
|
#define _MIPIA_READ_DATA_RETURN0 (dev_priv->mipi_mmio_base + 0xb118)
|
2014-11-14 14:54:21 +00:00
|
|
|
#define _MIPIC_READ_DATA_RETURN0 (dev_priv->mipi_mmio_base + 0xb918)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define MIPI_READ_DATA_RETURN(port, n) _MMIO(_MIPI(port, _MIPIA_READ_DATA_RETURN0, _MIPIC_READ_DATA_RETURN0) + 4 * (n)) /* n: 0...7 */
|
2013-08-27 12:12:16 +00:00
|
|
|
|
2014-06-02 12:37:47 +00:00
|
|
|
#define _MIPIA_READ_DATA_VALID (dev_priv->mipi_mmio_base + 0xb138)
|
2014-11-14 14:54:21 +00:00
|
|
|
#define _MIPIC_READ_DATA_VALID (dev_priv->mipi_mmio_base + 0xb938)
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define MIPI_READ_DATA_VALID(port) _MMIO_MIPI(port, _MIPIA_READ_DATA_VALID, _MIPIC_READ_DATA_VALID)
|
2013-08-27 12:12:16 +00:00
|
|
|
#define READ_DATA_VALID(n) (1 << (n))
|
|
|
|
|
drm/i915: Reorganize display pipe register accesses
RFCv2: Reorganize array indexing so that full offsets can be used as
is. It makes grepping for registers in i915_reg.h much easier. Also
move offset arrays to intel_device_info.
v1: Fixed offsets for VLV, proper eDP handling
v2: Fixed BCLRPAT, PIPESRC, PIPECONF and DSP* macros.
v3: Added EDP pipe comment, removed redundant offset arrays for
MSA_MISC and DDI_FUNC_CTL.
v4: Rename patch and report object size increase.
v5: Change location of commas, add PIPE_EDP into enum pipe
v6: Insert PIPE_EDP_OFFSET into pipe offset array
v7: Set I915_MAX_PIPES back to 3, change more registers accessors
to use the new macros, get rid of _PIPE_INC and add dev_priv
as a parameter where required by the new macros.
Upcoming hardware will not have the various display pipe register
ranges evenly spaced in memory. Change register address calculations
into array lookups.
Tested on SNB, VLV, IVB, Gen2 and HSW w/eDP.
I left the UMS cruft untouched.
Size differences:
text data bss dec hex filename
596431 4634 56 601121 92c21 i915.ko (new)
593199 4634 56 597889 91f81 i915.ko (old)
Signed-off-by: Antti Koskipaa <antti.koskipaa@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Tested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-02-04 12:22:24 +00:00
|
|
|
/* For UMS only (deprecated): */
|
2014-02-07 19:12:48 +00:00
|
|
|
#define _PALETTE_A (dev_priv->info.display_mmio_offset + 0xa000)
|
|
|
|
#define _PALETTE_B (dev_priv->info.display_mmio_offset + 0xa800)
|
drm/i915: Reorganize display pipe register accesses
RFCv2: Reorganize array indexing so that full offsets can be used as
is. It makes grepping for registers in i915_reg.h much easier. Also
move offset arrays to intel_device_info.
v1: Fixed offsets for VLV, proper eDP handling
v2: Fixed BCLRPAT, PIPESRC, PIPECONF and DSP* macros.
v3: Added EDP pipe comment, removed redundant offset arrays for
MSA_MISC and DDI_FUNC_CTL.
v4: Rename patch and report object size increase.
v5: Change location of commas, add PIPE_EDP into enum pipe
v6: Insert PIPE_EDP_OFFSET into pipe offset array
v7: Set I915_MAX_PIPES back to 3, change more registers accessors
to use the new macros, get rid of _PIPE_INC and add dev_priv
as a parameter where required by the new macros.
Upcoming hardware will not have the various display pipe register
ranges evenly spaced in memory. Change register address calculations
into array lookups.
Tested on SNB, VLV, IVB, Gen2 and HSW w/eDP.
I left the UMS cruft untouched.
Size differences:
text data bss dec hex filename
596431 4634 56 601121 92c21 i915.ko (new)
593199 4634 56 597889 91f81 i915.ko (old)
Signed-off-by: Antti Koskipaa <antti.koskipaa@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Tested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-02-04 12:22:24 +00:00
|
|
|
|
2015-07-10 17:13:11 +00:00
|
|
|
/* MOCS (Memory Object Control State) registers */
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN9_LNCFCMOCS(i) _MMIO(0xb020 + (i) * 4) /* L3 Cache Control */
|
2015-07-10 17:13:11 +00:00
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
#define GEN9_GFX_MOCS(i) _MMIO(0xc800 + (i) * 4) /* Graphics MOCS registers */
|
|
|
|
#define GEN9_MFX0_MOCS(i) _MMIO(0xc900 + (i) * 4) /* Media 0 MOCS registers */
|
|
|
|
#define GEN9_MFX1_MOCS(i) _MMIO(0xca00 + (i) * 4) /* Media 1 MOCS registers */
|
|
|
|
#define GEN9_VEBOX_MOCS(i) _MMIO(0xcb00 + (i) * 4) /* Video MOCS registers */
|
|
|
|
#define GEN9_BLT_MOCS(i) _MMIO(0xcc00 + (i) * 4) /* Blitter MOCS registers */
|
2015-07-10 17:13:11 +00:00
|
|
|
|
2016-02-04 11:49:34 +00:00
|
|
|
/* gamt regs */
|
|
|
|
#define GEN8_L3_LRA_1_GPGPU _MMIO(0x4dd4)
|
|
|
|
#define GEN8_L3_LRA_1_GPGPU_DEFAULT_VALUE_BDW 0x67F1427F /* max/min for LRA1/2 */
|
|
|
|
#define GEN8_L3_LRA_1_GPGPU_DEFAULT_VALUE_CHV 0x5FF101FF /* max/min for LRA1/2 */
|
|
|
|
#define GEN9_L3_LRA_1_GPGPU_DEFAULT_VALUE_SKL 0x67F1427F /* " " */
|
|
|
|
#define GEN9_L3_LRA_1_GPGPU_DEFAULT_VALUE_BXT 0x5FF101FF /* " " */
|
|
|
|
|
2008-07-29 18:54:06 +00:00
|
|
|
#endif /* _I915_REG_H_ */
|