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

Commit f7eb0c55 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-radeon-fusion' of ../drm-radeon-next into drm-core-next 

* 'drm-radeon-fusion' of ../drm-radeon-next:
  drm/radeon/kms: add Ontario APU ucode loading support
  drm/radeon/kms: add Ontario Fusion APU pci ids
  drm/radeon/kms: enable MSIs on fusion APUs
  drm/radeon/kms: add power table parsing support for Ontario fusion APUs
  drm/radeon/kms: refactor atombios power state fetching
  drm/radeon/kms: add bo blit support for Ontario fusion APUs
  drm/radeon/kms: add thermal sensor support for fusion APUs
  drm/radeon/kms: fill in GPU init for AMD Ontario Fusion APUs
  drm/radeon/kms: add radeon_asic struct for AMD Ontario fusion APUs
  drm/radeon/kms: evergreen.c updates for fusion
  drm/radeon/kms: MC setup changes for fusion APUs
  drm/radeon/kms: move r7xx/evergreen to its own vram_gtt setup function
  drm/radeon/kms: add support for ss overrides on Fusion APUs
  drm/radeon/kms: Add support for external encoders on fusion APUs
  drm/radeon/kms: atom changes for DCE4.1 devices
  drm/radeon/kms: add new family id for AMD Ontario APUs
  drm/radeon/kms: upstream power table updates
  drm/radeon/kms: upstream atombios.h updates
  drm/radeon/kms: upstream ObjectID.h updates
  drm/radeon/kms: setup mc chremap properly on r7xx/evergreen
parents 7e76c5cf 439bd6cd

drivers/gpu/drm/radeon/ObjectID.h

+48 −0
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ 
#define GRAPH_OBJECT_TYPE_CONNECTOR               0x3

#define GRAPH_OBJECT_TYPE_ROUTER                  0x4

/* deleted */

#define GRAPH_OBJECT_TYPE_DISPLAY_PATH            0x6  

#define GRAPH_OBJECT_TYPE_GENERIC                 0x7



/****************************************************/

/* Encoder Object ID Definition                     */
@@ -64,6 +66,9 @@ 
#define ENCODER_OBJECT_ID_VT1623                  0x10

#define ENCODER_OBJECT_ID_HDMI_SI1930             0x11

#define ENCODER_OBJECT_ID_HDMI_INTERNAL           0x12

#define ENCODER_OBJECT_ID_ALMOND                  0x22

#define ENCODER_OBJECT_ID_TRAVIS                  0x23

#define ENCODER_OBJECT_ID_NUTMEG                  0x22

/* Kaleidoscope (KLDSCP) Class Display Hardware (internal) */

#define ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1   0x13

#define ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1    0x14
@@ -108,6 +113,7 @@ 
#define CONNECTOR_OBJECT_ID_DISPLAYPORT           0x13

#define CONNECTOR_OBJECT_ID_eDP                   0x14

#define CONNECTOR_OBJECT_ID_MXM                   0x15

#define CONNECTOR_OBJECT_ID_LVDS_eDP              0x16



/* deleted */
@@ -124,6 +130,7 @@ 
#define GENERIC_OBJECT_ID_GLSYNC                  0x01

#define GENERIC_OBJECT_ID_PX2_NON_DRIVABLE        0x02

#define GENERIC_OBJECT_ID_MXM_OPM                 0x03

#define GENERIC_OBJECT_ID_STEREO_PIN              0x04        //This object could show up from Misc Object table, it follows ATOM_OBJECT format, and contains one ATOM_OBJECT_GPIO_CNTL_RECORD for the stereo pin



/****************************************************/

/* Graphics Object ENUM ID Definition               */
@@ -360,6 +367,26 @@ 
                                                  GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\

                                                  ENCODER_OBJECT_ID_GENERAL_EXTERNAL_DVO << OBJECT_ID_SHIFT)



#define ENCODER_ALMOND_ENUM_ID1                  ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\

                                                  GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\

                                                  ENCODER_OBJECT_ID_ALMOND << OBJECT_ID_SHIFT)



#define ENCODER_ALMOND_ENUM_ID2                  ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\

                                                  GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\

                                                  ENCODER_OBJECT_ID_ALMOND << OBJECT_ID_SHIFT)



#define ENCODER_TRAVIS_ENUM_ID1                  ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\

                                                  GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\

                                                  ENCODER_OBJECT_ID_TRAVIS << OBJECT_ID_SHIFT)



#define ENCODER_TRAVIS_ENUM_ID2                  ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\

                                                  GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\

                                                  ENCODER_OBJECT_ID_TRAVIS << OBJECT_ID_SHIFT)



#define ENCODER_NUTMEG_ENUM_ID1                  ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\

                                                  GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\

                                                  ENCODER_OBJECT_ID_NUTMEG << OBJECT_ID_SHIFT)



/****************************************************/

/* Connector Object ID definition - Shared with BIOS */

/****************************************************/
@@ -421,6 +448,14 @@ 
                                                 GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\

                                                 CONNECTOR_OBJECT_ID_SINGLE_LINK_DVI_D << OBJECT_ID_SHIFT)



#define CONNECTOR_SINGLE_LINK_DVI_D_ENUM_ID3   ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\

                                                 GRAPH_OBJECT_ENUM_ID3 << ENUM_ID_SHIFT |\

                                                 CONNECTOR_OBJECT_ID_SINGLE_LINK_DVI_D << OBJECT_ID_SHIFT)



#define CONNECTOR_SINGLE_LINK_DVI_D_ENUM_ID4   ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\

                                                 GRAPH_OBJECT_ENUM_ID4 << ENUM_ID_SHIFT |\

                                                 CONNECTOR_OBJECT_ID_SINGLE_LINK_DVI_D << OBJECT_ID_SHIFT)



#define CONNECTOR_DUAL_LINK_DVI_D_ENUM_ID1     ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\

                                                 GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\

                                                 CONNECTOR_OBJECT_ID_DUAL_LINK_DVI_D << OBJECT_ID_SHIFT)
@@ -512,6 +547,7 @@ 
#define CONNECTOR_7PIN_DIN_ENUM_ID1            ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\

                                                 GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\

                                                 CONNECTOR_OBJECT_ID_7PIN_DIN << OBJECT_ID_SHIFT)



#define CONNECTOR_7PIN_DIN_ENUM_ID2            ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\

                                                 GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\

                                                 CONNECTOR_OBJECT_ID_7PIN_DIN << OBJECT_ID_SHIFT)
@@ -593,6 +629,14 @@ 
                                                 GRAPH_OBJECT_ENUM_ID7 << ENUM_ID_SHIFT |\

                                                 CONNECTOR_OBJECT_ID_MXM << OBJECT_ID_SHIFT)          //Mapping to MXM_DAC



#define CONNECTOR_LVDS_eDP_ENUM_ID1            ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\

                                                 GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\

                                                 CONNECTOR_OBJECT_ID_LVDS_eDP << OBJECT_ID_SHIFT)



#define CONNECTOR_LVDS_eDP_ENUM_ID2            ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\

                                                 GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\

                                                 CONNECTOR_OBJECT_ID_LVDS_eDP << OBJECT_ID_SHIFT)



/****************************************************/

/* Router Object ID definition - Shared with BIOS   */

/****************************************************/
@@ -621,6 +665,10 @@ 
                                                 GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\

                                                 GENERIC_OBJECT_ID_MXM_OPM << OBJECT_ID_SHIFT)



#define GENERICOBJECT_STEREO_PIN_ENUM_ID1        (GRAPH_OBJECT_TYPE_GENERIC << OBJECT_TYPE_SHIFT |\

                                                 GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\

                                                 GENERIC_OBJECT_ID_STEREO_PIN << OBJECT_ID_SHIFT)



/****************************************************/

/* Object Cap definition - Shared with BIOS         */

/****************************************************/