Skip to content

Commit 4eb4d99

Browse files
author
Tian Tao
committed
drm/hisilicon: Support i2c driver algorithms for bit-shift adapters
Adding driver implementation to support i2c driver algorithms for bit-shift adapters, so hibmc will using the interface provided by drm to read edid. Signed-off-by: Tian Tao <[email protected]> Reviewed-by: Thomas Zimmermann <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 880ee3b commit 4eb4d99

File tree

3 files changed

+124
-2
lines changed

3 files changed

+124
-2
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# SPDX-License-Identifier: GPL-2.0-only
2-
hibmc-drm-y := hibmc_drm_drv.o hibmc_drm_de.o hibmc_drm_vdac.o hibmc_ttm.o
2+
hibmc-drm-y := hibmc_drm_drv.o hibmc_drm_de.o hibmc_drm_vdac.o hibmc_ttm.o hibmc_drm_i2c.o
33

44
obj-$(CONFIG_DRM_HISI_HIBMC) += hibmc-drm.o

drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,23 @@
1414
#ifndef HIBMC_DRM_DRV_H
1515
#define HIBMC_DRM_DRV_H
1616

17+
#include <linux/gpio/consumer.h>
18+
#include <linux/i2c-algo-bit.h>
19+
#include <linux/i2c.h>
20+
21+
#include <drm/drm_edid.h>
1722
#include <drm/drm_fb_helper.h>
1823
#include <drm/drm_framebuffer.h>
1924

2025
struct drm_device;
2126

27+
struct hibmc_connector {
28+
struct drm_connector base;
29+
30+
struct i2c_adapter adapter;
31+
struct i2c_algo_bit_data bit_data;
32+
};
33+
2234
struct hibmc_drm_private {
2335
/* hw */
2436
void __iomem *mmio;
@@ -31,10 +43,20 @@ struct hibmc_drm_private {
3143
struct drm_plane primary_plane;
3244
struct drm_crtc crtc;
3345
struct drm_encoder encoder;
34-
struct drm_connector connector;
46+
struct hibmc_connector connector;
3547
bool mode_config_initialized;
3648
};
3749

50+
static inline struct hibmc_connector *to_hibmc_connector(struct drm_connector *connector)
51+
{
52+
return container_of(connector, struct hibmc_connector, base);
53+
}
54+
55+
static inline struct hibmc_drm_private *to_hibmc_drm_private(struct drm_device *dev)
56+
{
57+
return dev->dev_private;
58+
}
59+
3860
void hibmc_set_power_mode(struct hibmc_drm_private *priv,
3961
unsigned int power_mode);
4062
void hibmc_set_current_gate(struct hibmc_drm_private *priv,
@@ -47,6 +69,7 @@ int hibmc_mm_init(struct hibmc_drm_private *hibmc);
4769
void hibmc_mm_fini(struct hibmc_drm_private *hibmc);
4870
int hibmc_dumb_create(struct drm_file *file, struct drm_device *dev,
4971
struct drm_mode_create_dumb *args);
72+
int hibmc_ddc_create(struct drm_device *drm_dev, struct hibmc_connector *connector);
5073

5174
extern const struct drm_mode_config_funcs hibmc_mode_funcs;
5275

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
// SPDX-License-Identifier: GPL-2.0-or-later
2+
/* Hisilicon Hibmc SoC drm driver
3+
*
4+
* Based on the bochs drm driver.
5+
*
6+
* Copyright (c) 2016 Huawei Limited.
7+
*
8+
* Author:
9+
* Tian Tao <[email protected]>
10+
*/
11+
12+
#include <linux/delay.h>
13+
#include <linux/pci.h>
14+
15+
#include <drm/drm_atomic_helper.h>
16+
#include <drm/drm_probe_helper.h>
17+
18+
#include "hibmc_drm_drv.h"
19+
20+
#define GPIO_DATA 0x0802A0
21+
#define GPIO_DATA_DIRECTION 0x0802A4
22+
23+
#define I2C_SCL_MASK BIT(0)
24+
#define I2C_SDA_MASK BIT(1)
25+
26+
static void hibmc_set_i2c_signal(void *data, u32 mask, int value)
27+
{
28+
struct hibmc_connector *hibmc_connector = data;
29+
struct hibmc_drm_private *priv = to_hibmc_drm_private(hibmc_connector->base.dev);
30+
u32 tmp_dir = readl(priv->mmio + GPIO_DATA_DIRECTION);
31+
32+
if (value) {
33+
tmp_dir &= ~mask;
34+
writel(tmp_dir, priv->mmio + GPIO_DATA_DIRECTION);
35+
} else {
36+
u32 tmp_data = readl(priv->mmio + GPIO_DATA);
37+
38+
tmp_data &= ~mask;
39+
writel(tmp_data, priv->mmio + GPIO_DATA);
40+
41+
tmp_dir |= mask;
42+
writel(tmp_dir, priv->mmio + GPIO_DATA_DIRECTION);
43+
}
44+
}
45+
46+
static int hibmc_get_i2c_signal(void *data, u32 mask)
47+
{
48+
struct hibmc_connector *hibmc_connector = data;
49+
struct hibmc_drm_private *priv = to_hibmc_drm_private(hibmc_connector->base.dev);
50+
u32 tmp_dir = readl(priv->mmio + GPIO_DATA_DIRECTION);
51+
52+
if ((tmp_dir & mask) != mask) {
53+
tmp_dir &= ~mask;
54+
writel(tmp_dir, priv->mmio + GPIO_DATA_DIRECTION);
55+
}
56+
57+
return (readl(priv->mmio + GPIO_DATA) & mask) ? 1 : 0;
58+
}
59+
60+
static void hibmc_ddc_setsda(void *data, int state)
61+
{
62+
hibmc_set_i2c_signal(data, I2C_SDA_MASK, state);
63+
}
64+
65+
static void hibmc_ddc_setscl(void *data, int state)
66+
{
67+
hibmc_set_i2c_signal(data, I2C_SCL_MASK, state);
68+
}
69+
70+
static int hibmc_ddc_getsda(void *data)
71+
{
72+
return hibmc_get_i2c_signal(data, I2C_SDA_MASK);
73+
}
74+
75+
static int hibmc_ddc_getscl(void *data)
76+
{
77+
return hibmc_get_i2c_signal(data, I2C_SCL_MASK);
78+
}
79+
80+
int hibmc_ddc_create(struct drm_device *drm_dev,
81+
struct hibmc_connector *connector)
82+
{
83+
connector->adapter.owner = THIS_MODULE;
84+
connector->adapter.class = I2C_CLASS_DDC;
85+
snprintf(connector->adapter.name, I2C_NAME_SIZE, "HIS i2c bit bus");
86+
connector->adapter.dev.parent = &drm_dev->pdev->dev;
87+
i2c_set_adapdata(&connector->adapter, connector);
88+
connector->adapter.algo_data = &connector->bit_data;
89+
90+
connector->bit_data.udelay = 20;
91+
connector->bit_data.timeout = usecs_to_jiffies(2000);
92+
connector->bit_data.data = connector;
93+
connector->bit_data.setsda = hibmc_ddc_setsda;
94+
connector->bit_data.setscl = hibmc_ddc_setscl;
95+
connector->bit_data.getsda = hibmc_ddc_getsda;
96+
connector->bit_data.getscl = hibmc_ddc_getscl;
97+
98+
return i2c_bit_add_bus(&connector->adapter);
99+
}

0 commit comments

Comments
 (0)