diff options
| author | Ville Syrjälä | 2015-03-10 16:02:21 +0100 |
|---|---|---|
| committer | Daniel Vetter | 2015-03-17 22:30:21 +0100 |
| commit | f4998963f2fbd4a22ae77624bc810b21208a8803 (patch) | |
| tree | b0ea6be308bdcb941479678b1347804ccd4b5ba8 /drivers/gpu/drm/i915/i915_reg.h | |
| parent | drm/i915: Add polish to VLV WM shift+mask operations (diff) | |
| download | kernel-qcow2-linux-f4998963f2fbd4a22ae77624bc810b21208a8803.tar.gz kernel-qcow2-linux-f4998963f2fbd4a22ae77624bc810b21208a8803.tar.xz kernel-qcow2-linux-f4998963f2fbd4a22ae77624bc810b21208a8803.zip | |
drm/i915: Use FW_WM() macro for older gmch platforms too
Use the FW_WM() macro from the VLV wm code to polish up the wm
code for older gmch platforms.
Cc: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_reg.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_reg.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index 8ff039d0f546..793ed6364383 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -4121,8 +4121,8 @@ enum skl_disp_power_wells { #define DSPFW_SPRITEB_MASK_VLV (0xff<<16) /* vlv/chv */ #define DSPFW_CURSORA_SHIFT 8 #define DSPFW_CURSORA_MASK (0x3f<<8) -#define DSPFW_PLANEC_SHIFT_OLD 0 -#define DSPFW_PLANEC_MASK_OLD (0x7f<<0) /* pre-gen4 sprite C */ +#define DSPFW_PLANEC_OLD_SHIFT 0 +#define DSPFW_PLANEC_OLD_MASK (0x7f<<0) /* pre-gen4 sprite C */ #define DSPFW_SPRITEA_SHIFT 0 #define DSPFW_SPRITEA_MASK (0x7f<<0) /* g4x */ #define DSPFW_SPRITEA_MASK_VLV (0xff<<0) /* vlv/chv */ |