diff options
author | Ville Syrjälä | 2018-05-14 19:24:23 +0200 |
---|---|---|
committer | Ville Syrjälä | 2018-05-17 18:39:01 +0200 |
commit | b45a258897a4a37b6cbc0bf1dc21354432f3e8c1 (patch) | |
tree | c683b9c94ef6244a5d293e012f7b9b8b1719b54d /drivers/gpu/drm/i915/i915_reg.h | |
parent | drm/i915: Clean up TV pipe select bits (diff) | |
download | kernel-qcow2-linux-b45a258897a4a37b6cbc0bf1dc21354432f3e8c1.tar.gz kernel-qcow2-linux-b45a258897a4a37b6cbc0bf1dc21354432f3e8c1.tar.xz kernel-qcow2-linux-b45a258897a4a37b6cbc0bf1dc21354432f3e8c1.zip |
drm/i915: Clean up DVO pipe select bits
Parametrize the DVO pipe select bits.
For consistency with the new way of doing things, let's read out the
pipe select bits even when the port is disable, even though we don't
need that behaviour for asserts in this case.
v2: Order the defines shift,mask,value (Jani)
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180514172423.9302-5-ville.syrjala@linux.intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/i915_reg.h')
-rw-r--r-- | drivers/gpu/drm/i915/i915_reg.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index dae213d4c13a..196a0eb79272 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -4357,7 +4357,9 @@ enum { #define _DVOC 0x61160 #define DVOC _MMIO(_DVOC) #define DVO_ENABLE (1 << 31) -#define DVO_PIPE_B_SELECT (1 << 30) +#define DVO_PIPE_SEL_SHIFT 30 +#define DVO_PIPE_SEL_MASK (1 << 30) +#define DVO_PIPE_SEL(pipe) ((pipe) << 30) #define DVO_PIPE_STALL_UNUSED (0 << 28) #define DVO_PIPE_STALL (1 << 28) #define DVO_PIPE_STALL_TV (2 << 28) |