aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2012-01-20 14:50:18 -0500
committerDave Airlie <airlied@redhat.com>2012-02-03 04:38:05 -0500
commit30388c6e48e62b2806b14552275f091e2f5adbf4 (patch)
tree304ba513a92d61a4943392df4b35b306add5cc07
parent9048955748aa14b1dbf068ef3a9288ec15cabc66 (diff)
drm/radeon/kms/dce3+: add support for hw i2c using atom
Starting with DCE3 hardware, atom contains a general purpose ProcessI2cChannelTransaction similar to ProcessAuxChannelTransaction. Add an implementation using the atom tables for DCE3+ hardware. This should be a little less CPU intensive than bit banging and may work better in certain cases. Enable it by setting the radeon hw_i2c module parameter to 1. E.g., radeon.hw_i2c=1 on the kernel command line in grub. Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--drivers/gpu/drm/radeon/Makefile2
-rw-r--r--drivers/gpu/drm/radeon/atombios_i2c.c139
-rw-r--r--drivers/gpu/drm/radeon/radeon_i2c.c21
3 files changed, 161 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/Makefile b/drivers/gpu/drm/radeon/Makefile
index 2139fe893ec5..84104153a684 100644
--- a/drivers/gpu/drm/radeon/Makefile
+++ b/drivers/gpu/drm/radeon/Makefile
@@ -71,7 +71,7 @@ radeon-y += radeon_device.o radeon_asic.o radeon_kms.o \
71 r600_blit_kms.o radeon_pm.o atombios_dp.o r600_audio.o r600_hdmi.o \ 71 r600_blit_kms.o radeon_pm.o atombios_dp.o r600_audio.o r600_hdmi.o \
72 evergreen.o evergreen_cs.o evergreen_blit_shaders.o evergreen_blit_kms.o \ 72 evergreen.o evergreen_cs.o evergreen_blit_shaders.o evergreen_blit_kms.o \
73 radeon_trace_points.o ni.o cayman_blit_shaders.o atombios_encoders.o \ 73 radeon_trace_points.o ni.o cayman_blit_shaders.o atombios_encoders.o \
74 radeon_semaphore.o radeon_sa.o 74 radeon_semaphore.o radeon_sa.o atombios_i2c.o
75 75
76radeon-$(CONFIG_COMPAT) += radeon_ioc32.o 76radeon-$(CONFIG_COMPAT) += radeon_ioc32.o
77radeon-$(CONFIG_VGA_SWITCHEROO) += radeon_atpx_handler.o 77radeon-$(CONFIG_VGA_SWITCHEROO) += radeon_atpx_handler.o
diff --git a/drivers/gpu/drm/radeon/atombios_i2c.c b/drivers/gpu/drm/radeon/atombios_i2c.c
new file mode 100644
index 000000000000..44d87b6b4220
--- /dev/null
+++ b/drivers/gpu/drm/radeon/atombios_i2c.c
@@ -0,0 +1,139 @@
1/*
2 * Copyright 2011 Advanced Micro Devices, Inc.
3 *
4 * Permission is hereby granted, free of charge, to any person obtaining a
5 * copy of this software and associated documentation files (the "Software"),
6 * to deal in the Software without restriction, including without limitation
7 * the rights to use, copy, modify, merge, publish, distribute, sublicense,
8 * and/or sell copies of the Software, and to permit persons to whom the
9 * Software is furnished to do so, subject to the following conditions:
10 *
11 * The above copyright notice and this permission notice shall be included in
12 * all copies or substantial portions of the Software.
13 *
14 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
17 * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
18 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
19 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
20 * OTHER DEALINGS IN THE SOFTWARE.
21 *
22 * Authors: Alex Deucher
23 *
24 */
25#include "drmP.h"
26#include "radeon_drm.h"
27#include "radeon.h"
28#include "atom.h"
29
30#define TARGET_HW_I2C_CLOCK 50
31
32/* these are a limitation of ProcessI2cChannelTransaction not the hw */
33#define ATOM_MAX_HW_I2C_WRITE 2
34#define ATOM_MAX_HW_I2C_READ 255
35
36static int radeon_process_i2c_ch(struct radeon_i2c_chan *chan,
37 u8 slave_addr, u8 flags,
38 u8 *buf, u8 num)
39{
40 struct drm_device *dev = chan->dev;
41 struct radeon_device *rdev = dev->dev_private;
42 PROCESS_I2C_CHANNEL_TRANSACTION_PS_ALLOCATION args;
43 int index = GetIndexIntoMasterTable(COMMAND, ProcessI2cChannelTransaction);
44 unsigned char *base;
45 u16 out;
46
47 memset(&args, 0, sizeof(args));
48
49 base = (unsigned char *)rdev->mode_info.atom_context->scratch;
50
51 if (flags & HW_I2C_WRITE) {
52 if (num > ATOM_MAX_HW_I2C_WRITE) {
53 DRM_ERROR("hw i2c: tried to write too many bytes (%d vs 2)\n", num);
54 return -EINVAL;
55 }
56 memcpy(&out, buf, num);
57 args.lpI2CDataOut = cpu_to_le16(out);
58 } else {
59 if (num > ATOM_MAX_HW_I2C_READ) {
60 DRM_ERROR("hw i2c: tried to read too many bytes (%d vs 255)\n", num);
61 return -EINVAL;
62 }
63 }
64
65 args.ucI2CSpeed = TARGET_HW_I2C_CLOCK;
66 args.ucRegIndex = 0;
67 args.ucTransBytes = num;
68 args.ucSlaveAddr = slave_addr << 1;
69 args.ucLineNumber = chan->rec.i2c_id;
70
71 atom_execute_table(rdev->mode_info.atom_context, index, (uint32_t *)&args);
72
73 /* error */
74 if (args.ucStatus != HW_ASSISTED_I2C_STATUS_SUCCESS) {
75 DRM_DEBUG_KMS("hw_i2c error\n");
76 return -EIO;
77 }
78
79 if (!(flags & HW_I2C_WRITE))
80 memcpy(buf, base, num);
81
82 return 0;
83}
84
85int radeon_atom_hw_i2c_xfer(struct i2c_adapter *i2c_adap,
86 struct i2c_msg *msgs, int num)
87{
88 struct radeon_i2c_chan *i2c = i2c_get_adapdata(i2c_adap);
89 struct i2c_msg *p;
90 int i, remaining, current_count, buffer_offset, max_bytes, ret;
91 u8 buf = 0, flags;
92
93 /* check for bus probe */
94 p = &msgs[0];
95 if ((num == 1) && (p->len == 0)) {
96 ret = radeon_process_i2c_ch(i2c,
97 p->addr, HW_I2C_WRITE,
98 &buf, 1);
99 if (ret)
100 return ret;
101 else
102 return num;
103 }
104
105 for (i = 0; i < num; i++) {
106 p = &msgs[i];
107 remaining = p->len;
108 buffer_offset = 0;
109 /* max_bytes are a limitation of ProcessI2cChannelTransaction not the hw */
110 if (p->flags & I2C_M_RD) {
111 max_bytes = ATOM_MAX_HW_I2C_READ;
112 flags = HW_I2C_READ;
113 } else {
114 max_bytes = ATOM_MAX_HW_I2C_WRITE;
115 flags = HW_I2C_WRITE;
116 }
117 while (remaining) {
118 if (remaining > max_bytes)
119 current_count = max_bytes;
120 else
121 current_count = remaining;
122 ret = radeon_process_i2c_ch(i2c,
123 p->addr, flags,
124 &p->buf[buffer_offset], current_count);
125 if (ret)
126 return ret;
127 remaining -= current_count;
128 buffer_offset += current_count;
129 }
130 }
131
132 return num;
133}
134
135u32 radeon_atom_hw_i2c_func(struct i2c_adapter *adap)
136{
137 return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL;
138}
139
diff --git a/drivers/gpu/drm/radeon/radeon_i2c.c b/drivers/gpu/drm/radeon/radeon_i2c.c
index c47f222f7442..3265a7a57977 100644
--- a/drivers/gpu/drm/radeon/radeon_i2c.c
+++ b/drivers/gpu/drm/radeon/radeon_i2c.c
@@ -30,6 +30,10 @@
30#include "radeon.h" 30#include "radeon.h"
31#include "atom.h" 31#include "atom.h"
32 32
33extern int radeon_atom_hw_i2c_xfer(struct i2c_adapter *i2c_adap,
34 struct i2c_msg *msgs, int num);
35extern u32 radeon_atom_hw_i2c_func(struct i2c_adapter *adap);
36
33/** 37/**
34 * radeon_ddc_probe 38 * radeon_ddc_probe
35 * 39 *
@@ -882,6 +886,11 @@ static const struct i2c_algorithm radeon_i2c_algo = {
882 .functionality = radeon_hw_i2c_func, 886 .functionality = radeon_hw_i2c_func,
883}; 887};
884 888
889static const struct i2c_algorithm radeon_atom_i2c_algo = {
890 .master_xfer = radeon_atom_hw_i2c_xfer,
891 .functionality = radeon_atom_hw_i2c_func,
892};
893
885struct radeon_i2c_chan *radeon_i2c_create(struct drm_device *dev, 894struct radeon_i2c_chan *radeon_i2c_create(struct drm_device *dev,
886 struct radeon_i2c_bus_rec *rec, 895 struct radeon_i2c_bus_rec *rec,
887 const char *name) 896 const char *name)
@@ -914,6 +923,18 @@ struct radeon_i2c_chan *radeon_i2c_create(struct drm_device *dev,
914 DRM_ERROR("Failed to register hw i2c %s\n", name); 923 DRM_ERROR("Failed to register hw i2c %s\n", name);
915 goto out_free; 924 goto out_free;
916 } 925 }
926 } else if (rec->hw_capable &&
927 radeon_hw_i2c &&
928 ASIC_IS_DCE3(rdev)) {
929 /* hw i2c using atom */
930 snprintf(i2c->adapter.name, sizeof(i2c->adapter.name),
931 "Radeon i2c hw bus %s", name);
932 i2c->adapter.algo = &radeon_atom_i2c_algo;
933 ret = i2c_add_adapter(&i2c->adapter);
934 if (ret) {
935 DRM_ERROR("Failed to register hw i2c %s\n", name);
936 goto out_free;
937 }
917 } else { 938 } else {
918 /* set the radeon bit adapter */ 939 /* set the radeon bit adapter */
919 snprintf(i2c->adapter.name, sizeof(i2c->adapter.name), 940 snprintf(i2c->adapter.name, sizeof(i2c->adapter.name),