[Intel-gfx] [PATCH 2/3] drm/i915: move VGA registers to intel_vga.c

[Jani Nikula]

On Fri, 07 Jan 2022, Matt Roper <matthew.d.roper at intel.com> wrote:
> On Fri, Jan 07, 2022 at 11:49:50AM +0200, Jani Nikula wrote:
>> The only users of the VGA register macros are in intel_vga.c. Hide the
>> macros there.
>> 
>> Cc: Matt Roper <matthew.d.roper at intel.com>
>> Signed-off-by: Jani Nikula <jani.nikula at intel.com>
>
> It looks like only 5 of the ~30 registers here are actually used.  And
> I think those could just be pulled from generic definitions in
> include/video/vga.h rather than having something in i915?

Good idea, thanks. Fixed in v2.

BR,
Jani.

>
> E.g.,
>  * VGA_MSR_WRITE -> VGA_MIS_W
>  * VGA_MSR_READ -> VGA_MIS_R
>  * VGA_SR_INDEX -> VGA_SEQ_I
>  * SR01 -> 1
>  * VGA_SR_DATA -> VGA_SEQ_D
>
>
> Matt
>
>> ---
>>  drivers/gpu/drm/i915/display/intel_vga.c | 41 ++++++++++++++++++++++++
>>  drivers/gpu/drm/i915/i915_reg.h          | 41 ------------------------
>>  2 files changed, 41 insertions(+), 41 deletions(-)
>> 
>> diff --git a/drivers/gpu/drm/i915/display/intel_vga.c b/drivers/gpu/drm/i915/display/intel_vga.c
>> index fa779f7ea415..5801cd41eb72 100644
>> --- a/drivers/gpu/drm/i915/display/intel_vga.c
>> +++ b/drivers/gpu/drm/i915/display/intel_vga.c
>> @@ -12,6 +12,47 @@
>>  #include "intel_de.h"
>>  #include "intel_vga.h"
>>  
>> +/* VGA registers */
>> +#define VGA_ST01_MDA				0x3ba
>> +#define VGA_ST01_CGA				0x3da
>> +
>> +#define VGA_MSR_WRITE				0x3c2
>> +#define VGA_MSR_READ				0x3cc
>> +#define   VGA_MSR_MEM_EN			(1 << 1)
>> +#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
>> +#define   VGA_AR_VID_EN (1 << 5)
>> +#define VGA_AR_DATA_WRITE			0x3c0
>> +#define VGA_AR_DATA_READ			0x3c1
>> +
>> +#define VGA_GR_INDEX				0x3ce
>> +#define VGA_GR_DATA				0x3cf
>> +/* GR05 */
>> +#define   VGA_GR_MEM_READ_MODE_SHIFT		3
>> +#define   VGA_GR_MEM_READ_MODE_PLANE		1
>> +/* GR06 */
>> +#define   VGA_GR_MEM_MODE_MASK			0xc
>> +#define   VGA_GR_MEM_MODE_SHIFT			2
>> +#define   VGA_GR_MEM_A0000_AFFFF		0
>> +#define   VGA_GR_MEM_A0000_BFFFF		1
>> +#define   VGA_GR_MEM_B0000_B7FFF		2
>> +#define   VGA_GR_MEM_B0000_BFFFF		3
>> +
>> +#define VGA_DACMASK				0x3c6
>> +#define VGA_DACRX				0x3c7
>> +#define VGA_DACWX				0x3c8
>> +#define VGA_DACDATA				0x3c9
>> +
>> +#define VGA_CR_INDEX_MDA			0x3b4
>> +#define VGA_CR_DATA_MDA				0x3b5
>> +#define VGA_CR_INDEX_CGA			0x3d4
>> +#define VGA_CR_DATA_CGA				0x3d5
>> +
>>  static i915_reg_t intel_vga_cntrl_reg(struct drm_i915_private *i915)
>>  {
>>  	if (IS_VALLEYVIEW(i915) || IS_CHERRYVIEW(i915))
>> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
>> index baa0b9e6acb2..7517a2688896 100644
>> --- a/drivers/gpu/drm/i915/i915_reg.h
>> +++ b/drivers/gpu/drm/i915/i915_reg.h
>> @@ -460,48 +460,7 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)
>>  #define GEN6_STOLEN_RESERVED_ENABLE	(1 << 0)
>>  #define GEN11_STOLEN_RESERVED_ADDR_MASK	(0xFFFFFFFFFFFULL << 20)
>>  
>> -/* VGA stuff */
>> -
>> -#define VGA_ST01_MDA 0x3ba
>> -#define VGA_ST01_CGA 0x3da
>> -
>>  #define _VGA_MSR_WRITE _MMIO(0x3c2)
>> -#define VGA_MSR_WRITE 0x3c2
>> -#define VGA_MSR_READ 0x3cc
>> -#define   VGA_MSR_MEM_EN (1 << 1)
>> -#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
>> -#define   VGA_AR_VID_EN (1 << 5)
>> -#define VGA_AR_DATA_WRITE 0x3c0
>> -#define VGA_AR_DATA_READ 0x3c1
>> -
>> -#define VGA_GR_INDEX 0x3ce
>> -#define VGA_GR_DATA 0x3cf
>> -/* GR05 */
>> -#define   VGA_GR_MEM_READ_MODE_SHIFT 3
>> -#define     VGA_GR_MEM_READ_MODE_PLANE 1
>> -/* GR06 */
>> -#define   VGA_GR_MEM_MODE_MASK 0xc
>> -#define   VGA_GR_MEM_MODE_SHIFT 2
>> -#define   VGA_GR_MEM_A0000_AFFFF 0
>> -#define   VGA_GR_MEM_A0000_BFFFF 1
>> -#define   VGA_GR_MEM_B0000_B7FFF 2
>> -#define   VGA_GR_MEM_B0000_BFFFF 3
>> -
>> -#define VGA_DACMASK 0x3c6
>> -#define VGA_DACRX 0x3c7
>> -#define VGA_DACWX 0x3c8
>> -#define VGA_DACDATA 0x3c9
>> -
>> -#define VGA_CR_INDEX_MDA 0x3b4
>> -#define VGA_CR_DATA_MDA 0x3b5
>> -#define VGA_CR_INDEX_CGA 0x3d4
>> -#define VGA_CR_DATA_CGA 0x3d5
>>  
>>  #define MI_PREDICATE_SRC0	_MMIO(0x2400)
>>  #define MI_PREDICATE_SRC0_UDW	_MMIO(0x2400 + 4)
>> -- 
>> 2.30.2
>> 

-- 
Jani Nikula, Intel Open Source Graphics Center