Skip to content

Commit b11bc1a

Browse files
mark1188-uilumag
authored andcommitted
drm/hisilicon/hibmc: Add MSI irq getting and requesting for HPD
To realize HPD feature, request irq for HPD , add its handler function. We use pci_alloc_irq_vectors() to get our msi irq, because we have two interrupts now. Signed-off-by: Baihan Li <libaihan@huawei.com> Signed-off-by: Yongbang Shi <shiyongbang@huawei.com> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Link: https://lore.kernel.org/r/20250331074212.3370287-9-shiyongbang@huawei.com Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
1 parent 3c7623f commit b11bc1a

File tree

3 files changed

+66
-14
lines changed

3 files changed

+66
-14
lines changed

drivers/gpu/drm/hisilicon/hibmc/dp/dp_reg.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,9 @@
9999

100100
#define HIBMC_DP_TIMING_SYNC_CTRL 0xFF0
101101

102+
#define HIBMC_DP_INTSTAT 0x1e0724
103+
#define HIBMC_DP_INTCLR 0x1e0728
104+
102105
/* dp serdes reg */
103106
#define HIBMC_DP_HOST_OFFSET 0x10000
104107
#define HIBMC_DP_LANE0_RATE_OFFSET 0x4

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

Lines changed: 60 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232

3333
DEFINE_DRM_GEM_FOPS(hibmc_fops);
3434

35+
static const char *g_irqs_names_map[HIBMC_MAX_VECTORS] = { "vblank", "hpd" };
36+
3537
static irqreturn_t hibmc_interrupt(int irq, void *arg)
3638
{
3739
struct drm_device *dev = (struct drm_device *)arg;
@@ -49,6 +51,22 @@ static irqreturn_t hibmc_interrupt(int irq, void *arg)
4951
return IRQ_HANDLED;
5052
}
5153

54+
static irqreturn_t hibmc_dp_interrupt(int irq, void *arg)
55+
{
56+
struct drm_device *dev = (struct drm_device *)arg;
57+
struct hibmc_drm_private *priv = to_hibmc_drm_private(dev);
58+
u32 status;
59+
60+
status = readl(priv->mmio + HIBMC_DP_INTSTAT);
61+
if (status) {
62+
priv->dp.irq_status = status;
63+
writel(status, priv->mmio + HIBMC_DP_INTCLR);
64+
return IRQ_WAKE_THREAD;
65+
}
66+
67+
return IRQ_HANDLED;
68+
}
69+
5270
static int hibmc_dumb_create(struct drm_file *file, struct drm_device *dev,
5371
struct drm_mode_create_dumb *args)
5472
{
@@ -251,15 +269,48 @@ static int hibmc_hw_init(struct hibmc_drm_private *priv)
251269
return 0;
252270
}
253271

254-
static int hibmc_unload(struct drm_device *dev)
272+
static void hibmc_unload(struct drm_device *dev)
255273
{
256-
struct pci_dev *pdev = to_pci_dev(dev->dev);
257-
258274
drm_atomic_helper_shutdown(dev);
275+
}
259276

260-
free_irq(pdev->irq, dev);
277+
static int hibmc_msi_init(struct drm_device *dev)
278+
{
279+
struct pci_dev *pdev = to_pci_dev(dev->dev);
280+
char name[32] = {0};
281+
int valid_irq_num;
282+
int irq;
283+
int ret;
261284

262-
pci_disable_msi(to_pci_dev(dev->dev));
285+
ret = pci_alloc_irq_vectors(pdev, HIBMC_MIN_VECTORS,
286+
HIBMC_MAX_VECTORS, PCI_IRQ_MSI);
287+
if (ret < 0) {
288+
drm_err(dev, "enabling MSI failed: %d\n", ret);
289+
return ret;
290+
}
291+
292+
valid_irq_num = ret;
293+
294+
for (int i = 0; i < valid_irq_num; i++) {
295+
snprintf(name, ARRAY_SIZE(name) - 1, "%s-%s-%s",
296+
dev->driver->name, pci_name(pdev), g_irqs_names_map[i]);
297+
298+
irq = pci_irq_vector(pdev, i);
299+
300+
if (i)
301+
/* PCI devices require shared interrupts. */
302+
ret = devm_request_threaded_irq(&pdev->dev, irq,
303+
hibmc_dp_interrupt,
304+
hibmc_dp_hpd_isr,
305+
IRQF_SHARED, name, dev);
306+
else
307+
ret = devm_request_irq(&pdev->dev, irq, hibmc_interrupt,
308+
IRQF_SHARED, name, dev);
309+
if (ret) {
310+
drm_err(dev, "install irq failed: %d\n", ret);
311+
return ret;
312+
}
313+
}
263314

264315
return 0;
265316
}
@@ -291,15 +342,10 @@ static int hibmc_load(struct drm_device *dev)
291342
goto err;
292343
}
293344

294-
ret = pci_enable_msi(pdev);
345+
ret = hibmc_msi_init(dev);
295346
if (ret) {
296-
drm_warn(dev, "enabling MSI failed: %d\n", ret);
297-
} else {
298-
/* PCI devices require shared interrupts. */
299-
ret = request_irq(pdev->irq, hibmc_interrupt, IRQF_SHARED,
300-
dev->driver->name, dev);
301-
if (ret)
302-
drm_warn(dev, "install irq failed: %d\n", ret);
347+
drm_err(dev, "hibmc msi init failed, ret:%d\n", ret);
348+
goto err;
303349
}
304350

305351
/* reset all the states of crtc/plane/encoder/connector */
@@ -375,7 +421,7 @@ static void hibmc_pci_remove(struct pci_dev *pdev)
375421

376422
static void hibmc_pci_shutdown(struct pci_dev *pdev)
377423
{
378-
drm_atomic_helper_shutdown(pci_get_drvdata(pdev));
424+
hibmc_pci_remove(pdev);
379425
}
380426

381427
static const struct pci_device_id hibmc_pci_table[] = {

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222

2323
#include "dp/dp_hw.h"
2424

25+
#define HIBMC_MIN_VECTORS 1
26+
#define HIBMC_MAX_VECTORS 2
27+
2528
struct hibmc_vdac {
2629
struct drm_device *dev;
2730
struct drm_encoder encoder;

0 commit comments

Comments
 (0)