Skip to content

L
linux
Commit 40bacf16 authored by Alex Deucher's avatar Alex Deucher Committed by Dave Airlie
Browse files
Options

drm/radeon/kms: add support for hw i2c on r1xx-r5xx 

wire hw i2c support into radeon i2c algo.

fixes merged:
- handle bus probing correctly
- use meaningful error numbers
- abort if transaction fails
- The line mapping is different depending on the asic.
- protect hw i2c engine with a mutex
- rs300 doesn't have a pin select bit
- r200 has a different pin select setup
Signed-off-by: default avatarAlex Deucher <alexdeucher@gmail.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 5a6f98f5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 736 additions and 82 deletions
drivers/gpu/drm/radeon/r500_reg.h
View file @ 40bacf16
...@@ -717,54 +717,62 @@ ...@@ -717,54 +717,62 @@
#define AVIVO_DVOA_BIT_DEPTH_CONTROL 0x7988 #define AVIVO_DVOA_BIT_DEPTH_CONTROL 0x7988
#define AVIVO_DC_GPIO_HPD_A 0x7e94 #define AVIVO_DC_GPIO_HPD_A 0x7e94
#define AVIVO_GPIO_0 0x7e30
#define AVIVO_GPIO_1 0x7e40
#define AVIVO_GPIO_2 0x7e50
#define AVIVO_GPIO_3 0x7e60
#define AVIVO_DC_GPIO_HPD_Y 0x7e9c #define AVIVO_DC_GPIO_HPD_Y 0x7e9c
#define AVIVO_I2C_STATUS 0x7d30 #define AVIVO_DC_I2C_STATUS1 0x7d30
# define AVIVO_I2C_STATUS_DONE (1 << 0) # define AVIVO_DC_I2C_DONE (1 << 0)
# define AVIVO_I2C_STATUS_NACK (1 << 1) # define AVIVO_DC_I2C_NACK (1 << 1)
# define AVIVO_I2C_STATUS_HALT (1 << 2) # define AVIVO_DC_I2C_HALT (1 << 2)
# define AVIVO_I2C_STATUS_GO (1 << 3) # define AVIVO_DC_I2C_GO (1 << 3)
# define AVIVO_I2C_STATUS_MASK 0x7 #define AVIVO_DC_I2C_RESET 0x7d34
/* If radeon_mm_i2c is to be believed, this is HALT, NACK, and maybe # define AVIVO_DC_I2C_SOFT_RESET (1 << 0)
* DONE? */ # define AVIVO_DC_I2C_ABORT (1 << 8)
# define AVIVO_I2C_STATUS_CMD_RESET 0x7 #define AVIVO_DC_I2C_CONTROL1 0x7d38
# define AVIVO_I2C_STATUS_CMD_WAIT (1 << 3) # define AVIVO_DC_I2C_START (1 << 0)
#define AVIVO_I2C_STOP 0x7d34 # define AVIVO_DC_I2C_STOP (1 << 1)
#define AVIVO_I2C_START_CNTL 0x7d38 # define AVIVO_DC_I2C_RECEIVE (1 << 2)
# define AVIVO_I2C_START (1 << 8) # define AVIVO_DC_I2C_EN (1 << 8)
# define AVIVO_I2C_CONNECTOR0 (0 << 16) # define AVIVO_DC_I2C_PIN_SELECT(x) ((x) << 16)
# define AVIVO_I2C_CONNECTOR1 (1 << 16) # define AVIVO_SEL_DDC1 0
#define R520_I2C_START (1<<0) # define AVIVO_SEL_DDC2 1
#define R520_I2C_STOP (1<<1) # define AVIVO_SEL_DDC3 2
#define R520_I2C_RX (1<<2) #define AVIVO_DC_I2C_CONTROL2 0x7d3c
#define R520_I2C_EN (1<<8) # define AVIVO_DC_I2C_ADDR_COUNT(x) ((x) << 0)
#define R520_I2C_DDC1 (0<<16) # define AVIVO_DC_I2C_DATA_COUNT(x) ((x) << 8)
#define R520_I2C_DDC2 (1<<16) #define AVIVO_DC_I2C_CONTROL3 0x7d40
#define R520_I2C_DDC3 (2<<16) # define AVIVO_DC_I2C_DATA_DRIVE_EN (1 << 0)
#define R520_I2C_DDC_MASK (3<<16) # define AVIVO_DC_I2C_DATA_DRIVE_SEL (1 << 1)
#define AVIVO_I2C_CONTROL2 0x7d3c # define AVIVO_DC_I2C_CLK_DRIVE_EN (1 << 7)
# define AVIVO_I2C_7D3C_SIZE_SHIFT 8 # define AVIVO_DC_I2C_RD_INTRA_BYTE_DELAY(x) ((x) << 8)
# define AVIVO_I2C_7D3C_SIZE_MASK (0xf << 8) # define AVIVO_DC_I2C_WR_INTRA_BYTE_DELAY(x) ((x) << 16)
#define AVIVO_I2C_CONTROL3 0x7d40 # define AVIVO_DC_I2C_TIME_LIMIT(x) ((x) << 24)
/* Reading is done 4 bytes at a time: read the bottom 8 bits from #define AVIVO_DC_I2C_DATA 0x7d44
* 7d44, four times in a row. #define AVIVO_DC_I2C_INTERRUPT_CONTROL 0x7d48
* Writing is a little more complex. First write DATA with # define AVIVO_DC_I2C_INTERRUPT_STATUS (1 << 0)
* 0xnnnnnnzz, then 0xnnnnnnyy, where nnnnnn is some non-deterministic # define AVIVO_DC_I2C_INTERRUPT_AK (1 << 8)
* magic number, zz is, I think, the slave address, and yy is the byte # define AVIVO_DC_I2C_INTERRUPT_ENABLE (1 << 16)
* you want to write. */ #define AVIVO_DC_I2C_ARBITRATION 0x7d50
#define AVIVO_I2C_DATA 0x7d44 # define AVIVO_DC_I2C_SW_WANTS_TO_USE_I2C (1 << 0)
#define R520_I2C_ADDR_COUNT_MASK (0x7) # define AVIVO_DC_I2C_SW_CAN_USE_I2C (1 << 1)
#define R520_I2C_DATA_COUNT_SHIFT (8) # define AVIVO_DC_I2C_SW_DONE_USING_I2C (1 << 8)
#define R520_I2C_DATA_COUNT_MASK (0xF00) # define AVIVO_DC_I2C_HW_NEEDS_I2C (1 << 9)
#define AVIVO_I2C_CNTL 0x7d50 # define AVIVO_DC_I2C_ABORT_HDCP_I2C (1 << 16)
# define AVIVO_I2C_EN (1 << 0) # define AVIVO_DC_I2C_HW_USING_I2C (1 << 17)
# define AVIVO_I2C_RESET (1 << 8)
#define AVIVO_DC_GPIO_DDC1_MASK 0x7e40
#define AVIVO_DC_GPIO_DDC1_A 0x7e44
#define AVIVO_DC_GPIO_DDC1_EN 0x7e48
#define AVIVO_DC_GPIO_DDC1_Y 0x7e4c
#define AVIVO_DC_GPIO_DDC2_MASK 0x7e50
#define AVIVO_DC_GPIO_DDC2_A 0x7e54
#define AVIVO_DC_GPIO_DDC2_EN 0x7e58
#define AVIVO_DC_GPIO_DDC2_Y 0x7e5c
#define AVIVO_DC_GPIO_DDC3_MASK 0x7e60
#define AVIVO_DC_GPIO_DDC3_A 0x7e64
#define AVIVO_DC_GPIO_DDC3_EN 0x7e68
#define AVIVO_DC_GPIO_DDC3_Y 0x7e6c
#define AVIVO_DISP_INTERRUPT_STATUS 0x7edc #define AVIVO_DISP_INTERRUPT_STATUS 0x7edc
# define AVIVO_D1_VBLANK_INTERRUPT (1 << 4) # define AVIVO_D1_VBLANK_INTERRUPT (1 << 4)
......
drivers/gpu/drm/radeon/radeon.h
View file @ 40bacf16
...@@ -829,6 +829,7 @@ struct radeon_device { ...@@ -829,6 +829,7 @@ struct radeon_device {
struct r600_ih ih; /* r6/700 interrupt ring */ struct r600_ih ih; /* r6/700 interrupt ring */
struct workqueue_struct *wq; struct workqueue_struct *wq;
struct work_struct hotplug_work; struct work_struct hotplug_work;
struct mutex dc_hw_i2c_mutex; /* display controller hw i2c mutex */
/* audio stuff */ /* audio stuff */
struct timer_list audio_timer; struct timer_list audio_timer;
......
drivers/gpu/drm/radeon/radeon_combios.c
View file @ 40bacf16
...@@ -486,9 +486,65 @@ static struct radeon_i2c_bus_rec combios_setup_i2c_bus(struct radeon_device *rde ...@@ -486,9 +486,65 @@ static struct radeon_i2c_bus_rec combios_setup_i2c_bus(struct radeon_device *rde
i2c.y_data_reg = ddc_line; i2c.y_data_reg = ddc_line;
} }
if (rdev->family < CHIP_R200) switch (rdev->family) {
i2c.hw_capable = false; case CHIP_R100:
else { case CHIP_RV100:
case CHIP_RS100:
case CHIP_RV200:
case CHIP_RS200:
case CHIP_RS300:
switch (ddc_line) {
case RADEON_GPIO_DVI_DDC:
/* in theory this should be hw capable,
* but it doesn't seem to work
*/
i2c.hw_capable = false;
break;
default:
i2c.hw_capable = false;
break;
}
break;
case CHIP_R200:
switch (ddc_line) {
case RADEON_GPIO_DVI_DDC:
case RADEON_GPIO_MONID:
i2c.hw_capable = true;
break;
default:
i2c.hw_capable = false;
break;
}
break;
case CHIP_RV250:
case CHIP_RV280:
switch (ddc_line) {
case RADEON_GPIO_VGA_DDC:
case RADEON_GPIO_DVI_DDC:
case RADEON_GPIO_CRT2_DDC:
i2c.hw_capable = true;
break;
default:
i2c.hw_capable = false;
break;
}
break;
case CHIP_R300:
case CHIP_R350:
switch (ddc_line) {
case RADEON_GPIO_VGA_DDC:
case RADEON_GPIO_DVI_DDC:
i2c.hw_capable = true;
break;
default:
i2c.hw_capable = false;
break;
}
break;
case CHIP_RV350:
case CHIP_RV380:
case CHIP_RS400:
case CHIP_RS480:
switch (ddc_line) { switch (ddc_line) {
case RADEON_GPIO_VGA_DDC: case RADEON_GPIO_VGA_DDC:
case RADEON_GPIO_DVI_DDC: case RADEON_GPIO_DVI_DDC:
...@@ -504,6 +560,10 @@ static struct radeon_i2c_bus_rec combios_setup_i2c_bus(struct radeon_device *rde ...@@ -504,6 +560,10 @@ static struct radeon_i2c_bus_rec combios_setup_i2c_bus(struct radeon_device *rde
i2c.hw_capable = false; i2c.hw_capable = false;
break; break;
} }
break;
default:
i2c.hw_capable = false;
break;
} }
i2c.mm_i2c = false; i2c.mm_i2c = false;
i2c.i2c_id = 0; i2c.i2c_id = 0;
...@@ -1253,7 +1313,10 @@ bool radeon_legacy_get_ext_tmds_info_from_combios(struct radeon_encoder *encoder ...@@ -1253,7 +1313,10 @@ bool radeon_legacy_get_ext_tmds_info_from_combios(struct radeon_encoder *encoder
tmds->i2c_bus = radeon_i2c_create(dev, &i2c_bus, "DVO"); tmds->i2c_bus = radeon_i2c_create(dev, &i2c_bus, "DVO");
break; break;
case DDC_LCD: /* MM i2c */ case DDC_LCD: /* MM i2c */
DRM_ERROR("MM i2c requires hw i2c engine\n"); i2c_bus.valid = true;
i2c_bus.hw_capable = true;
i2c_bus.mm_i2c = true;
tmds->i2c_bus = radeon_i2c_create(dev, &i2c_bus, "DVO");
break; break;
default: default:
DRM_ERROR("Unsupported gpio %d\n", gpio); DRM_ERROR("Unsupported gpio %d\n", gpio);
......
drivers/gpu/drm/radeon/radeon_device.c
View file @ 40bacf16
...@@ -638,6 +638,7 @@ int radeon_device_init(struct radeon_device *rdev, ...@@ -638,6 +638,7 @@ int radeon_device_init(struct radeon_device *rdev,
mutex_init(&rdev->cs_mutex); mutex_init(&rdev->cs_mutex);
mutex_init(&rdev->ib_pool.mutex); mutex_init(&rdev->ib_pool.mutex);
mutex_init(&rdev->cp.mutex); mutex_init(&rdev->cp.mutex);
mutex_init(&rdev->dc_hw_i2c_mutex);
if (rdev->family >= CHIP_R600) if (rdev->family >= CHIP_R600)
spin_lock_init(&rdev->ih.lock); spin_lock_init(&rdev->ih.lock);
mutex_init(&rdev->gem.mutex); mutex_init(&rdev->gem.mutex);
......
drivers/gpu/drm/radeon/radeon_i2c.c
View file @ 40bacf16
This diff is collapsed.
drivers/gpu/drm/radeon/radeon_reg.h
View file @ 40bacf16
...@@ -1060,32 +1060,38 @@ ...@@ -1060,32 +1060,38 @@
/* Multimedia I2C bus */ /* Multimedia I2C bus */
#define RADEON_I2C_CNTL_0 0x0090 #define RADEON_I2C_CNTL_0 0x0090
#define RADEON_I2C_DONE (1 << 0) # define RADEON_I2C_DONE (1 << 0)
#define RADEON_I2C_NACK (1 << 1) # define RADEON_I2C_NACK (1 << 1)
#define RADEON_I2C_HALT (1 << 2) # define RADEON_I2C_HALT (1 << 2)
#define RADEON_I2C_SOFT_RST (1 << 5) # define RADEON_I2C_SOFT_RST (1 << 5)
#define RADEON_I2C_DRIVE_EN (1 << 6) # define RADEON_I2C_DRIVE_EN (1 << 6)
#define RADEON_I2C_DRIVE_SEL (1 << 7) # define RADEON_I2C_DRIVE_SEL (1 << 7)
#define RADEON_I2C_START (1 << 8) # define RADEON_I2C_START (1 << 8)
#define RADEON_I2C_STOP (1 << 9) # define RADEON_I2C_STOP (1 << 9)
#define RADEON_I2C_RECEIVE (1 << 10) # define RADEON_I2C_RECEIVE (1 << 10)
#define RADEON_I2C_ABORT (1 << 11) # define RADEON_I2C_ABORT (1 << 11)
#define RADEON_I2C_GO (1 << 12) # define RADEON_I2C_GO (1 << 12)
#define RADEON_I2C_PRESCALE_SHIFT 16 # define RADEON_I2C_PRESCALE_SHIFT 16
#define RADEON_I2C_CNTL_1 0x0094 #define RADEON_I2C_CNTL_1 0x0094
#define RADEON_I2C_DATA_COUNT_SHIFT 0 # define RADEON_I2C_DATA_COUNT_SHIFT 0
#define RADEON_I2C_ADDR_COUNT_SHIFT 4 # define RADEON_I2C_ADDR_COUNT_SHIFT 4
#define RADEON_I2C_INTRA_BYTE_DELAY_SHIFT 8 # define RADEON_I2C_INTRA_BYTE_DELAY_SHIFT 8
#define RADEON_I2C_SEL (1 << 16) # define RADEON_I2C_SEL (1 << 16)
#define RADEON_I2C_EN (1 << 17) # define RADEON_I2C_EN (1 << 17)
#define RADEON_I2C_TIME_LIMIT_SHIFT 24 # define RADEON_I2C_TIME_LIMIT_SHIFT 24
#define RADEON_I2C_DATA 0x0098 #define RADEON_I2C_DATA 0x0098
#define RADEON_DVI_I2C_CNTL_0 0x02e0 #define RADEON_DVI_I2C_CNTL_0 0x02e0
# define R200_DVI_I2C_PIN_SEL(x) ((x) << 3) # define R200_DVI_I2C_PIN_SEL(x) ((x) << 3)
# define R200_SEL_DDC1 0 /* 0x60 - VGA_DDC */ # define R200_SEL_DDC1 0 /* depends on asic */
# define R200_SEL_DDC2 1 /* 0x64 - DVI_DDC */ # define R200_SEL_DDC2 1 /* depends on asic */
# define R200_SEL_DDC3 2 /* 0x68 - MONID_DDC */ # define R200_SEL_DDC3 2 /* depends on asic */
# define RADEON_SW_WANTS_TO_USE_DVI_I2C (1 << 13)
# define RADEON_SW_CAN_USE_DVI_I2C (1 << 13)
# define RADEON_SW_DONE_USING_DVI_I2C (1 << 14)
# define RADEON_HW_NEEDS_DVI_I2C (1 << 14)
# define RADEON_ABORT_HW_DVI_I2C (1 << 15)
# define RADEON_HW_USING_DVI_I2C (1 << 15)
#define RADEON_DVI_I2C_CNTL_1 0x02e4 #define RADEON_DVI_I2C_CNTL_1 0x02e4
#define RADEON_DVI_I2C_DATA 0x02e8 #define RADEON_DVI_I2C_DATA 0x02e8
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7