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

Commit f930ddd0 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: remove duplicate register #defines 



Somehow a chunk of unused register defines ended up in the middle of
the PLL defines. They go back to the original kms merging.

The only used #define is SR01, move it to the register name together
with the other legacy vga stuff.

Reviewed-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 7b01e260

drivers/gpu/drm/i915/i915_reg.h

+1 −17
Original line number Diff line number Diff line
@@ -142,6 +142,7 @@ 
#define   VGA_MSR_CGA_MODE (1<<0)



#define VGA_SR_INDEX 0x3c4

#define SR01			1

#define VGA_SR_DATA 0x3c5



#define VGA_AR_INDEX 0x3c0
@@ -938,23 +939,6 @@ 
#define   DPLL_LOCK_VLV			(1<<15)

#define   DPLL_INTEGRATED_CLOCK_VLV	(1<<13)



#define SRX_INDEX		0x3c4

#define SRX_DATA		0x3c5

#define SR01			1

#define SR01_SCREEN_OFF		(1<<5)



#define PPCR			0x61204

#define PPCR_ON			(1<<0)



#define DVOB			0x61140

#define DVOB_ON			(1<<31)

#define DVOC			0x61160

#define DVOC_ON			(1<<31)

#define LVDS			0x61180

#define LVDS_ON			(1<<31)



/* Scratch pad debug 0 reg:

 */

#define   DPLL_FPA01_P1_POST_DIV_MASK_I830	0x001f0000

/*

 * The i830 generation, in LVDS mode, defines P1 as the bit number set within