diff options
| author | Jesse Barnes | 2011-01-05 00:09:30 +0100 |
|---|---|---|
| committer | Chris Wilson | 2011-01-19 13:35:49 +0100 |
| commit | b24e71798871089da1a4ab049db2800afc1aac0c (patch) | |
| tree | b189257e13929f115641751061edbee8da861fa0 /drivers/gpu/drm/i915/i915_reg.h | |
| parent | drm/i915: don't enable plane, pipe and PLL prematurely (diff) | |
| download | kernel-qcow2-linux-b24e71798871089da1a4ab049db2800afc1aac0c.tar.gz kernel-qcow2-linux-b24e71798871089da1a4ab049db2800afc1aac0c.tar.xz kernel-qcow2-linux-b24e71798871089da1a4ab049db2800afc1aac0c.zip | |
drm/i915: add pipe/plane enable/disable functions
Add plane enable/disable functions to prevent duplicated code and allow
us to easily check for plane enable/disable requirements (such as pipe
enable, plane status, pll status etc).
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_reg.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_reg.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index 40a407f41f61..c739a4bbf005 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -2528,9 +2528,10 @@ #define DISPPLANE_32BPP_30BIT_NO_ALPHA (0xa<<26) #define DISPPLANE_STEREO_ENABLE (1<<25) #define DISPPLANE_STEREO_DISABLE 0 -#define DISPPLANE_SEL_PIPE_MASK (1<<24) +#define DISPPLANE_SEL_PIPE_SHIFT 24 +#define DISPPLANE_SEL_PIPE_MASK (3<<DISPPLANE_SEL_PIPE_SHIFT) #define DISPPLANE_SEL_PIPE_A 0 -#define DISPPLANE_SEL_PIPE_B (1<<24) +#define DISPPLANE_SEL_PIPE_B (1<<DISPPLANE_SEL_PIPE_SHIFT) #define DISPPLANE_SRC_KEY_ENABLE (1<<22) #define DISPPLANE_SRC_KEY_DISABLE 0 #define DISPPLANE_LINE_DOUBLE (1<<20) |