Commit 5abd7d8d authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915/dvo: Define a few more DVO register bits 



Define a few extra interrupt related bits on the DVO register.
One of these we included in the DVO_PRESERVE_MASK already.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221122120825.26338-6-ville.syrjala@linux.intel.com


Acked-by: default avatarJani Nikula <jani.nikula@intel.com>
parent a8d9a13d

drivers/gpu/drm/i915/display/intel_dvo.c

+2 −1
Original line number Diff line number Diff line
@@ -290,7 +290,8 @@ static void intel_dvo_pre_enable(struct intel_atomic_state *state, 


	/* Save the data order, since I don't know what it should be set to. */

	dvo_val = intel_de_read(i915, DVO(port)) &

		  (DVO_PRESERVE_MASK | DVO_DATA_ORDER_GBRG);

		  (DVO_DEDICATED_INT_ENABLE |

		   DVO_PRESERVE_MASK | DVO_DATA_ORDER_GBRG);

	dvo_val |= DVO_DATA_ORDER_FP | DVO_BORDER_ENABLE |

		   DVO_BLANK_ACTIVE_HIGH;

drivers/gpu/drm/i915/i915_reg.h

+3 −1
Original line number Diff line number Diff line
@@ -2602,6 +2602,9 @@ 
#define   DVO_PIPE_STALL		(1 << 28)

#define   DVO_PIPE_STALL_TV		(2 << 28)

#define   DVO_PIPE_STALL_MASK		(3 << 28)

#define   DVO_INTERRUPT_SELECT		(1 << 27)

#define   DVO_DEDICATED_INT_ENABLE	(1 << 26)

#define   DVO_PRESERVE_MASK		(0x3 << 24)

#define   DVO_USE_VGA_SYNC		(1 << 15)

#define   DVO_DATA_ORDER_I740		(0 << 14)

#define   DVO_DATA_ORDER_FP		(1 << 14)
@@ -2619,7 +2622,6 @@ 
#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)

#define _DVOA_SRCDIM		0x61124

#define _DVOB_SRCDIM		0x61144

#define _DVOC_SRCDIM		0x61164