Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f0d1aff authored by Jesse Barnes's avatar Jesse Barnes Committed by Chris Wilson
Browse files

drm/i915: fix pipeconf dither bit definitions 



Make them match the others and add BPP definitions.

Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent dd2575ff

drivers/gpu/drm/i915/i915_reg.h

+11 −5
Original line number Diff line number Diff line
@@ -2078,11 +2078,6 @@ 


/* Display & cursor control */



/* dithering flag on Ironlake */

#define PIPE_ENABLE_DITHER		(1 << 4)

#define PIPE_DITHER_TYPE_MASK		(3 << 2)

#define PIPE_DITHER_TYPE_SPATIAL	(0 << 2)

#define PIPE_DITHER_TYPE_ST01		(1 << 2)

/* Pipe A */

#define PIPEADSL		0x70000

#define   DSL_LINEMASK	       	0x00000fff
@@ -2101,6 +2096,17 @@ 
#define   PIPECONF_INTERLACE_W_FIELD_INDICATION	(6 << 21)

#define   PIPECONF_INTERLACE_FIELD_0_ONLY		(7 << 21)

#define   PIPECONF_CXSR_DOWNCLOCK	(1<<16)

#define   PIPECONF_BPP_MASK	(0x000000e0)

#define   PIPECONF_BPP_8	(0<<5)

#define   PIPECONF_BPP_10	(1<<5)

#define   PIPECONF_BPP_6	(2<<5)

#define   PIPECONF_BPP_12	(3<<5)

#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)

#define PIPEASTAT		0x70024

#define   PIPE_FIFO_UNDERRUN_STATUS		(1UL<<31)

#define   PIPE_CRC_ERROR_ENABLE			(1UL<<29)

drivers/gpu/drm/i915/intel_display.c

+4 −4
Original line number Diff line number Diff line
@@ -3910,8 +3910,8 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc, 
	}



	if (HAS_PCH_SPLIT(dev)) {

		pipeconf &= ~PIPE_ENABLE_DITHER;

		pipeconf &= ~PIPE_DITHER_TYPE_MASK;

		pipeconf &= ~PIPECONF_DITHER_EN;

		pipeconf &= ~PIPECONF_DITHER_TYPE_MASK;

	}



	/* The LVDS pin pair needs to be on before the DPLLs are enabled.
@@ -3955,8 +3955,8 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc, 
		if (IS_I965G(dev)) {

			if (dev_priv->lvds_dither) {

				if (HAS_PCH_SPLIT(dev)) {

					pipeconf |= PIPE_ENABLE_DITHER;

					pipeconf |= PIPE_DITHER_TYPE_ST01;

					pipeconf |= PIPECONF_DITHER_EN;

					pipeconf |= PIPECONF_DITHER_TYPE_ST1;

				} else

					lvds |= LVDS_ENABLE_DITHER;

			} else {