drm/amdgpu: Clear the hotplug interrupt ack bit before hpd initialization
Subsystems (2)
PATCH v2 1/1 drm/amdgpu: Clear the hotplug interrupt ack bit before hpd initialization
Problem:
The computer in the bios initialization process, unplug the HDMI display, wait until the system up, plug in the HDMI display, did not enter the hotplug interrupt function, the display is not bright.
Fix:
After the above problem occurs, and the hpd ack interrupt bit is 1, the interrupt should be cleared during hpd_init initialization so that when the driver is ready, it can respond to the hpd interrupt normally.
---
v2:
- Remove unused variable 'tmp'
- Fixed function spelling errors
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 2 ++
drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 2 ++ drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 22 ++++++++++++++++++---- drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 22 ++++++++++++++++++---- 4 files changed, 40 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c +2 -0
@@ -51,6 +51,7 @@static void dce_v10_0_set_display_funcs (struct amdgpu_device *adev);static void dce_v10_0_set_irq_funcs (struct amdgpu_device *adev); +static void dce_v10_0_hpd_int_ack (struct amdgpu_device *adev,int hpd);static const u32 crtc_offsets[] = {CRTC0_REGISTER_OFFSET ,
@@ -363,6 +364,7 @@ static void dce_v10_0_hpd_init(struct amdgpu_device *adev) AMDGPU_HPD_DISCONNECT_INT_DELAY_IN_MS);WREG32 (mmDC_HPD_TOGGLE_FILT_CNTL + hpd_offsets[amdgpu_connector->hpd.hpd], tmp); +dce_v10_0_hpd_int_ack (adev, amdgpu_connector->hpd.hpd);dce_v10_0_hpd_set_polarity (adev, amdgpu_connector->hpd.hpd);amdgpu_irq_get (adev, &adev->hpd_irq, amdgpu_connector->hpd.hpd);
drivers/gpu/drm/amd/amdgpu/dce_v11_0.c +2 -0
@@ -51,6 +51,7 @@static void dce_v11_0_set_display_funcs (struct amdgpu_device *adev);static void dce_v11_0_set_irq_funcs (struct amdgpu_device *adev); +static void dce_v11_0_hpd_int_ack (struct amdgpu_device *adev,int hpd);static const u32 crtc_offsets[] = {
@@ -387,6 +388,7 @@ static void dce_v11_0_hpd_init(struct amdgpu_device *adev) AMDGPU_HPD_DISCONNECT_INT_DELAY_IN_MS);WREG32 (mmDC_HPD_TOGGLE_FILT_CNTL + hpd_offsets[amdgpu_connector->hpd.hpd], tmp); +dce_v11_0_hpd_int_ack (adev, amdgpu_connector->hpd.hpd);dce_v11_0_hpd_set_polarity (adev, amdgpu_connector->hpd.hpd);amdgpu_irq_get (adev, &adev->hpd_irq, amdgpu_connector->hpd.hpd); }
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +18 -4
@@ -272,6 +272,21 @@ static void dce_v6_0_hpd_set_polarity(struct amdgpu_device *adev,WREG32 (mmDC_HPD1_INT_CONTROL + hpd_offsets[hpd], tmp); } +static void dce_v6_0_hpd_int_ack (struct amdgpu_device *adev, +int hpd) +{ +u32 tmp; + +if (hpd >= adev->mode_info.num_hpd) { +DRM_DEBUG ("invalid hdp %d\n" , hpd); +return ; + } + + tmp =RREG32 (mmDC_HPD1_INT_CONTROL + hpd_offsets[hpd]); + tmp |=DC_HPD1_INT_CONTROL__DC_HPD1_INT_ACK_MASK ; +WREG32 (mmDC_HPD1_INT_CONTROL + hpd_offsets[hpd], tmp); +} +/** * dce_v6_0_hpd_init - hpd setup callback. *
@@ -311,6 +326,7 @@ static void dce_v6_0_hpd_init(struct amdgpu_device *adev)continue ; } +dce_v6_0_hpd_int_ack (adev, amdgpu_connector->hpd.hpd);dce_v6_0_hpd_set_polarity (adev, amdgpu_connector->hpd.hpd);amdgpu_irq_get (adev, &adev->hpd_irq, amdgpu_connector->hpd.hpd); }
@@ -3088,7 +3104,7 @@ static int dce_v6_0_hpd_irq(struct amdgpu_device *adev,struct amdgpu_irq_src *source, struct amdgpu_iv_entry *entry) { - uint32_t disp_int, mask, tmp; + uint32_t disp_int, mask;unsigned hpd;if (entry->src_data[0 ] >= adev->mode_info.num_hpd) {
@@ -3101,9 +3117,7 @@ static int dce_v6_0_hpd_irq(struct amdgpu_device *adev, mask = interrupt_status_offsets[hpd].hpd;if (disp_int & mask) { - tmp =RREG32 (mmDC_HPD1_INT_CONTROL + hpd_offsets[hpd]); - tmp |=DC_HPD1_INT_CONTROL__DC_HPD1_INT_ACK_MASK ; -WREG32 (mmDC_HPD1_INT_CONTROL + hpd_offsets[hpd], tmp); +dce_v6_0_hpd_int_ack (adev, hpd);schedule_delayed_work (&adev->hotplug_work,0 );DRM_DEBUG ("IH: HPD%d\n" , hpd +1 ); }
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +18 -4
@@ -264,6 +264,21 @@ static void dce_v8_0_hpd_set_polarity(struct amdgpu_device *adev,WREG32 (mmDC_HPD1_INT_CONTROL + hpd_offsets[hpd], tmp); } +static void dce_v8_0_hpd_int_ack (struct amdgpu_device *adev, +int hpd) +{ +u32 tmp; + +if (hpd >= adev->mode_info.num_hpd) { +DRM_DEBUG ("invalid hdp %d\n" , hpd); +return ; + } + + tmp =RREG32 (mmDC_HPD1_INT_CONTROL + hpd_offsets[hpd]); + tmp |=DC_HPD1_INT_CONTROL__DC_HPD1_INT_ACK_MASK ; +WREG32 (mmDC_HPD1_INT_CONTROL + hpd_offsets[hpd], tmp); +} +/** * dce_v8_0_hpd_init - hpd setup callback. *
@@ -303,6 +318,7 @@ static void dce_v8_0_hpd_init(struct amdgpu_device *adev)continue ; } +dce_v8_0_hpd_int_ack (adev, amdgpu_connector->hpd.hpd);dce_v8_0_hpd_set_polarity (adev, amdgpu_connector->hpd.hpd);amdgpu_irq_get (adev, &adev->hpd_irq, amdgpu_connector->hpd.hpd); }
@@ -3176,7 +3192,7 @@ static int dce_v8_0_hpd_irq(struct amdgpu_device *adev,struct amdgpu_irq_src *source, struct amdgpu_iv_entry *entry) { - uint32_t disp_int, mask, tmp; + uint32_t disp_int, mask;unsigned hpd;if (entry->src_data[0 ] >= adev->mode_info.num_hpd) {
@@ -3189,9 +3205,7 @@ static int dce_v8_0_hpd_irq(struct amdgpu_device *adev, mask = interrupt_status_offsets[hpd].hpd;if (disp_int & mask) { - tmp =RREG32 (mmDC_HPD1_INT_CONTROL + hpd_offsets[hpd]); - tmp |=DC_HPD1_INT_CONTROL__DC_HPD1_INT_ACK_MASK ; -WREG32 (mmDC_HPD1_INT_CONTROL + hpd_offsets[hpd], tmp); +dce_v8_0_hpd_int_ack (adev, hpd);schedule_delayed_work (&adev->hotplug_work,0 );DRM_DEBUG ("IH: HPD%d\n" , hpd +1 ); }
Signature · 1 line
2.20.1
On Wed, 31 Jan 2024 15:57:03 +0800
Qiang Ma <[email protected]> wrote:
Hello everyone, please help review this patch.
Qiang Ma
Quoted 175 lines
Problem:
The computer in the bios initialization process, unplug the HDMI display, wait until the system up, plug in the HDMI display, did not enter the hotplug interrupt function, the display is not bright.Fix:
After the above problem occurs, and the hpd ack interrupt bit is 1, the interrupt should be cleared duringhpd_initinitialization so that when the driver is ready, it can respond to the hpd interrupt normally.Signed-off-by Qiang Ma <[email protected]>---
v2:
- Remove unused variable 'tmp'
- Fixed function spelling errors
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c| 2 ++drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 2 ++ drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 22 ++++++++++++++++++---- drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 22 ++++++++++++++++++---- 4 files changed, 40 insertions(+), 8 deletions(-)(quoted diff) +0
-0
b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.cindexbb666cb7522e..12a8ba929a72100644 ---a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c+++b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c@@ -51,6 +51,7 @@static void
dce_v10_0_set_display_funcs(struct amdgpu_device *adev); static voiddce_v10_0_set_irq_funcs(struct amdgpu_device *adev);
+static voiddce_v10_0_hpd_int_ack(struct amdgpu_device *adev, int hpd);
static const u32 crtc_offsets[] = {drivers/gpu/drm/amd/amdgpu/dce_v10_0.c +1
-0CRTC0_REGISTER_OFFSET,@@ -363,6 +364,7 @@ static void dce_v10_0_hpd_init(struct amdgpu_device *adev) AMDGPU_HPD_DISCONNECT_INT_DELAY_IN_MS);WREG32 (mmDC_HPD_TOGGLE_FILT_CNTL + hpd_offsets[amdgpu_connector->hpd.hpd], tmp); +dce_v10_0_hpd_int_ack (adev, amdgpu_connector->hpd.hpd);dce_v10_0_hpd_set_polarity (adev, amdgpu_connector->hpd.hpd);amdgpu_irq_get (adev, &adev->hpd_irq, amdgpu_connector->hpd.hpd);(quoted diff) +0
-0
b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.cindex7af277f61cca..745e4fdffade100644 ---a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c+++b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c@@ -51,6 +51,7 @@static void
dce_v11_0_set_display_funcs(struct amdgpu_device *adev); static voiddce_v11_0_set_irq_funcs(struct amdgpu_device *adev);
+static voiddce_v11_0_hpd_int_ack(struct amdgpu_device *adev, int hpd);
static const u32 crtc_offsets[] =
{(quoted diff) +1
-0@@ -387,6 +388,7 @@ static void dce_v11_0_hpd_init(struct amdgpu_device *adev) AMDGPU_HPD_DISCONNECT_INT_DELAY_IN_MS); WREG32(mmDC_HPD_TOGGLE_FILT_CNTL + hpd_offsets[amdgpu_connector->hpd.hpd], tmp); + dce_v11_0_hpd_int_ack(adev, amdgpu_connector->hpd.hpd); dce_v11_0_hpd_set_polarity(adev, amdgpu_connector->hpd.hpd); amdgpu_irq_get(adev, &adev->hpd_irq, amdgpu_connector->hpd.hpd); }(quoted diff) +0
-0
b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.cindex143efc37a17f..28c4a735716b100644 ---a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c+++b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c@@ -272,6 +272,21 @@ static void dce_v6_0_hpd_set_polarity(structamdgpu_device*adev,WREG32(mmDC_HPD1_INT_CONTROL + hpd_offsets[hpd], tmp); }drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +18
-4+static void dce_v6_0_hpd_int_ack (struct amdgpu_device *adev, +int hpd) +{ +u32 tmp; + +if (hpd >= adev->mode_info.num_hpd) { +DRM_DEBUG ("invalid hdp %d\n" , hpd); +return ; + } + + tmp =RREG32 (mmDC_HPD1_INT_CONTROL + hpd_offsets[hpd]); + tmp |=DC_HPD1_INT_CONTROL__DC_HPD1_INT_ACK_MASK ; +WREG32 (mmDC_HPD1_INT_CONTROL + hpd_offsets[hpd], tmp); +} +/** * dce_v6_0_hpd_init - hpd setup callback. * @@ -311,6 +326,7 @@ static void dce_v6_0_hpd_init(struct amdgpu_device *adev) continue; } +dce_v6_0_hpd_int_ack (adev, amdgpu_connector->hpd.hpd);dce_v6_0_hpd_set_polarity (adev, amdgpu_connector->hpd.hpd);amdgpu_irq_get (adev, &adev->hpd_irq, amdgpu_connector->hpd.hpd); }@@ -3088,7 +3104,7 @@ static int dce_v6_0_hpd_irq(struct amdgpu_device *adev, struct amdgpu_irq_src *source, struct amdgpu_iv_entry *entry) { - uint32_t disp_int, mask, tmp; + uint32_t disp_int, mask;unsigned hpd;if (entry->src_data[0 ] >= adev->mode_info.num_hpd) {@@ -3101,9 +3117,7 @@ static int dce_v6_0_hpd_irq(structamdgpu_device *adev, mask = interrupt_status_offsets[hpd].hpd;if (disp_int & mask) { - tmp =RREG32 (mmDC_HPD1_INT_CONTROL + hpd_offsets[hpd]); - tmp |=DC_HPD1_INT_CONTROL__DC_HPD1_INT_ACK_MASK ; -WREG32 (mmDC_HPD1_INT_CONTROL + hpd_offsets[hpd], tmp); +dce_v6_0_hpd_int_ack (adev, hpd);schedule_delayed_work (&adev->hotplug_work,0 );(quoted diff) +0
-0DRM_DEBUG("IH: HPD%d\n", hpd + 1); }(quoted diff) +0
-0
b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.cindexadeddfb7ff12..8ff2b5adfd95100644 ---a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c+++b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c@@ -264,6 +264,21 @@ static void dce_v8_0_hpd_set_polarity(structamdgpu_device*adev,WREG32(mmDC_HPD1_INT_CONTROL + hpd_offsets[hpd], tmp); }drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +18
-4+static void dce_v8_0_hpd_int_ack (struct amdgpu_device *adev, +int hpd) +{ +u32 tmp; + +if (hpd >= adev->mode_info.num_hpd) { +DRM_DEBUG ("invalid hdp %d\n" , hpd); +return ; + } + + tmp =RREG32 (mmDC_HPD1_INT_CONTROL + hpd_offsets[hpd]); + tmp |=DC_HPD1_INT_CONTROL__DC_HPD1_INT_ACK_MASK ; +WREG32 (mmDC_HPD1_INT_CONTROL + hpd_offsets[hpd], tmp); +} +/** * dce_v8_0_hpd_init - hpd setup callback. * @@ -303,6 +318,7 @@ static void dce_v8_0_hpd_init(struct amdgpu_device *adev) continue; } +dce_v8_0_hpd_int_ack (adev, amdgpu_connector->hpd.hpd);dce_v8_0_hpd_set_polarity (adev, amdgpu_connector->hpd.hpd);amdgpu_irq_get (adev, &adev->hpd_irq, amdgpu_connector->hpd.hpd); }@@ -3176,7 +3192,7 @@ static int dce_v8_0_hpd_irq(struct amdgpu_device *adev, struct amdgpu_irq_src *source, struct amdgpu_iv_entry *entry) { - uint32_t disp_int, mask, tmp; + uint32_t disp_int, mask;unsigned hpd;if (entry->src_data[0 ] >= adev->mode_info.num_hpd) {@@ -3189,9 +3205,7 @@ static int dce_v8_0_hpd_irq(structamdgpu_device *adev, mask = interrupt_status_offsets[hpd].hpd;if (disp_int & mask) { - tmp =RREG32 (mmDC_HPD1_INT_CONTROL + hpd_offsets[hpd]); - tmp |=DC_HPD1_INT_CONTROL__DC_HPD1_INT_ACK_MASK ; -WREG32 (mmDC_HPD1_INT_CONTROL + hpd_offsets[hpd], tmp); +dce_v8_0_hpd_int_ack (adev, hpd);schedule_delayed_work (&adev->hotplug_work,0 );(quoted diff) +0
-0DRM_DEBUG("IH: HPD%d\n", hpd + 1); }
Deucher, Alexander
maintainer[Public]
Quoted 12 lines
-----Original Message-----
From: Qiang Ma <[email protected]>
Sent: Wednesday, March 13, 2024 2:18 AM
To: Deucher, Alexander <[email protected]>; Koenig, Christian <[email protected]>; Pan, Xinhui <[email protected]>; [email protected]; [email protected]; SHANMUGAM, SRINIVASAN <[email protected]>; [email protected]
Cc: [email protected]; [email protected]; linux- [email protected]
Subject: Re: [PATCH v2] drm/amdgpu: Clear the hotplug interrupt ack bit before hpd initialization
Quoted 4 lines
On Wed, 31 Jan 2024 15:57:03 +0800
Qiang Ma <[email protected]> wrote:Hello everyone, please help review this patch.
This was applied back in January, sorry if I forget to reply.
Alex
Quoted 182 lines
Qiang Ma
Quoted 12 lines
Problem:
The computer in the bios initialization process, unplug the HDMI display, wait until the system up, plug in the HDMI display, did not enter the hotplug interrupt function, the display is not bright.Fix:
After the above problem occurs, and the hpd ack interrupt bit is 1, the interrupt should be cleared duringhpd_initinitialization so that when the driver is ready, it can respond to the hpd interrupt normally.Signed-off-by Qiang Ma <[email protected]>Quoted 8 lines
---
v2:
- Remove unused variable 'tmp'
- Fixed function spelling errorsdrivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 2 ++ drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 2 ++ drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 22 ++++++++++++++++++----
Quoted 1 line
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c| 22 ++++++++++++++++++----
Quoted 41 lines
4 files changed, 40 insertions(+), 8 deletions(-)(quoted diff) +0
-0
b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.cindexbb666cb7522e..12a8ba929a72100644 ---a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c+++b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c@@ -51,6 +51,7 @@static void
dce_v10_0_set_display_funcs(struct amdgpu_device *adev);
static voiddce_v10_0_set_irq_funcs(struct amdgpu_device *adev); +static voiddce_v10_0_hpd_int_ack(struct amdgpu_device *adev, int hpd);
static const u32 crtc_offsets[] = {
CRTC0_REGISTER_OFFSET,(quoted diff) +1
-0@@ -363,6 +364,7 @@ static void dce_v10_0_hpd_init(struct amdgpu_device *adev) AMDGPU_HPD_DISCONNECT_INT_DELAY_IN_MS); WREG32(mmDC_HPD_TOGGLE_FILT_CNTL + hpd_offsets[amdgpu_connector->hpd.hpd], tmp); + dce_v10_0_hpd_int_ack(adev, amdgpu_connector->hpd.hpd); dce_v10_0_hpd_set_polarity(adev, amdgpu_connector->hpd.hpd); amdgpu_irq_get(adev, &adev->hpd_irq, amdgpu_connector->hpd.hpd); diff --git
a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.cb/drivers/gpu/drm/amd/amdgpu/dce_v11_0.cindex7af277f61cca..745e4fdffade100644 ---a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c+++b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c@@ -51,6 +51,7 @@static void
dce_v11_0_set_display_funcs(struct amdgpu_device *adev);
static voiddce_v11_0_set_irq_funcs(struct amdgpu_device *adev); +static voiddce_v11_0_hpd_int_ack(struct amdgpu_device *adev, int hpd);
static const u32 crtc_offsets[] =
{(quoted diff) +1
-0@@ -387,6 +388,7 @@ static void dce_v11_0_hpd_init(struct amdgpu_device *adev) AMDGPU_HPD_DISCONNECT_INT_DELAY_IN_MS); WREG32(mmDC_HPD_TOGGLE_FILT_CNTL + hpd_offsets[amdgpu_connector->hpd.hpd], tmp); + dce_v11_0_hpd_int_ack(adev, amdgpu_connector->hpd.hpd); dce_v11_0_hpd_set_polarity(adev, amdgpu_connector->hpd.hpd); amdgpu_irq_get(adev, &adev->hpd_irq,Quoted 6 lines
amdgpu_connector->hpd.hpd); } diff --gita/drivers/gpu/drm/amd/amdgpu/dce_v6_0.cb/drivers/gpu/drm/amd/amdgpu/dce_v6_0.cindex143efc37a17f..28c4a735716b100644 ---a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c+++b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c@@ -272,6 +272,21 @@static
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c static void dce_v6_0_hpd_init(struct
Quoted 21 lines
void dce_v6_0_hpd_set_polarity(struct
amdgpu_device*adev,WREG32(mmDC_HPD1_INT_CONTROL + hpd_offsets[hpd], tmp); }drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +14
-0+static void dce_v6_0_hpd_int_ack (struct amdgpu_device *adev, +int hpd) +{ +u32 tmp; + +if (hpd >= adev->mode_info.num_hpd) { +DRM_DEBUG ("invalid hdp %d\n" , hpd); +return ; + } + + tmp =RREG32 (mmDC_HPD1_INT_CONTROL + hpd_offsets[hpd]); + tmp |=DC_HPD1_INT_CONTROL__DC_HPD1_INT_ACK_MASK ; +WREG32 (mmDC_HPD1_INT_CONTROL + hpd_offsets[hpd], tmp); } +/** * dce_v6_0_hpd_init - hpd setup callback. * @@ -311,6 +326,7 @@ static void dce_v6_0_hpd_init(struct
amdgpu_deviceQuoted 18 lines
(quoted diff) +1
-0*adev) continue; } + dce_v6_0_hpd_int_ack(adev, amdgpu_connector->hpd.hpd); dce_v6_0_hpd_set_polarity(adev, amdgpu_connector->hpd.hpd); amdgpu_irq_get(adev, &adev->hpd_irq,
amdgpu_connector->hpd.hpd); } @@ -3088,7 +3104,7 @@ static int dce_v6_0_hpd_irq(structamdgpu_device*adev, structamdgpu_irq_src*source,struct amdgpu_iv_entry *entry) {drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +2
-1-uint32_t disp_int, mask, tmp; +uint32_t disp_int, mask;unsigned hpd; if (entry->src_data[0] >= adev->mode_info.num_hpd) { @@ -3101,9 +3117,7 @@ static int dce_v6_0_hpd_irq(struct amdgpu_device *adev,mask = interrupt_status_offsets[hpd].hpd;
Quoted 4 lines
if (disp_int & mask) {- tmp = RREG32(mmDC_HPD1_INT_CONTROL +
hpd_offsets[hpd]);
- tmp |=
DC_HPD1_INT_CONTROL__DC_HPD1_INT_ACK_MASK;Quoted 11 lines
- WREG32(mmDC_HPD1_INT_CONTROL + hpd_offsets[hpd],
tmp);drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +1
-0+dce_v6_0_hpd_int_ack (adev, hpd);schedule_delayed_work (&adev->hotplug_work,0 );DRM_DEBUG ("IH: HPD%d\n" , hpd +1 ); }(quoted diff) +0
-0
b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.cindexadeddfb7ff12..8ff2b5adfd95100644 ---a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c+++b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c@@ -264,6 +264,21 @@static
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c static void dce_v8_0_hpd_init(struct
Quoted 21 lines
void dce_v8_0_hpd_set_polarity(struct
amdgpu_device*adev,WREG32(mmDC_HPD1_INT_CONTROL + hpd_offsets[hpd], tmp); }drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +14
-0+static void dce_v8_0_hpd_int_ack (struct amdgpu_device *adev, +int hpd) +{ +u32 tmp; + +if (hpd >= adev->mode_info.num_hpd) { +DRM_DEBUG ("invalid hdp %d\n" , hpd); +return ; + } + + tmp =RREG32 (mmDC_HPD1_INT_CONTROL + hpd_offsets[hpd]); + tmp |=DC_HPD1_INT_CONTROL__DC_HPD1_INT_ACK_MASK ; +WREG32 (mmDC_HPD1_INT_CONTROL + hpd_offsets[hpd], tmp); } +/** * dce_v8_0_hpd_init - hpd setup callback. * @@ -303,6 +318,7 @@ static void dce_v8_0_hpd_init(struct
amdgpu_deviceQuoted 18 lines
(quoted diff) +1
-0*adev) continue; } + dce_v8_0_hpd_int_ack(adev, amdgpu_connector->hpd.hpd); dce_v8_0_hpd_set_polarity(adev, amdgpu_connector->hpd.hpd); amdgpu_irq_get(adev, &adev->hpd_irq,
amdgpu_connector->hpd.hpd); } @@ -3176,7 +3192,7 @@ static int dce_v8_0_hpd_irq(structamdgpu_device*adev, structamdgpu_irq_src*source,struct amdgpu_iv_entry *entry) {drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +2
-1-uint32_t disp_int, mask, tmp; +uint32_t disp_int, mask;unsigned hpd; if (entry->src_data[0] >= adev->mode_info.num_hpd) { @@ -3189,9 +3205,7 @@ static int dce_v8_0_hpd_irq(struct amdgpu_device *adev,mask = interrupt_status_offsets[hpd].hpd;
Quoted 4 lines
if (disp_int & mask) {- tmp = RREG32(mmDC_HPD1_INT_CONTROL +
hpd_offsets[hpd]);
- tmp |=
DC_HPD1_INT_CONTROL__DC_HPD1_INT_ACK_MASK;Quoted 6 lines
- WREG32(mmDC_HPD1_INT_CONTROL + hpd_offsets[hpd],
tmp);+ dce_v8_0_hpd_int_ack(adev, hpd); schedule_delayed_work(&adev->hotplug_work, 0); DRM_DEBUG("IH: HPD%d\n", hpd + 1); }
Quoted 14 lines · Alexander
[Public]
Quoted 12 lines
-----Original Message-----
From: Qiang Ma <[email protected]>
Sent: Wednesday, March 13, 2024 2:18 AM
To: Deucher, Alexander <[email protected]>; Koenig, Christian <[email protected]>; Pan, Xinhui <[email protected]>; [email protected]; [email protected]; SHANMUGAM, SRINIVASAN <[email protected]>; [email protected] Cc: [email protected]; [email protected]; linux- [email protected]
Subject: Re: [PATCH v2] drm/amdgpu: Clear the hotplug interrupt ack bit before hpd initialization
Quoted 8 lines
Quoted 4 lines
On Wed, 31 Jan 2024 15:57:03 +0800
Qiang Ma <[email protected]> wrote:Hello everyone, please help review this patch.
This was applied back in January, sorry if I forget to reply.
Alex
Hi, Alex, it doesn't matter, please take some time to help review this patch.
This patch mainly solves the problem that after unplugging the HDMI display during bios initialization, the display does not light up after the system starts.
Qiang Ma
Quoted 188 lines
Quoted 186 lines
Qiang Ma
Quoted 18 lines
Problem:
The computer in the bios initialization process, unplug the HDMI display, wait until the system up, plug in the HDMI display, did not enter the hotplug interrupt function, the display is not bright.Fix:
After the above problem occurs, and the hpd ack interrupt bit is 1, the interrupt should be cleared duringhpd_initinitialization so that when the driver is ready, it can respond to the hpd interrupt normally.Signed-off-by Qiang Ma <[email protected]>---
v2:
- Remove unused variable 'tmp'
- Fixed function spelling errorsQuoted 4 lines
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 2 ++ drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 2 ++ drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 22++++++++++++++++++---
-
Quoted 2 lines
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c| 22
++++++++++++++++++----
Quoted 41 lines
4 files changed, 40 insertions(+), 8 deletions(-)(quoted diff) +0
-0
b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.cindexbb666cb7522e..12a8ba929a72100644 ---a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c+++b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c@@ -51,6 +51,7 @@static void dce_v10_0_set_display_funcs(struct
amdgpu_device
*adev); static voiddce_v10_0_set_irq_funcs(struct amdgpu_device *adev); +static voiddce_v10_0_hpd_int_ack(struct amdgpu_device *adev, int hpd);
static const u32 crtc_offsets[] = {
CRTC0_REGISTER_OFFSET,(quoted diff) +1
-0@@ -363,6 +364,7 @@ static void dce_v10_0_hpd_init(struct amdgpu_device *adev) AMDGPU_HPD_DISCONNECT_INT_DELAY_IN_MS); WREG32(mmDC_HPD_TOGGLE_FILT_CNTL + hpd_offsets[amdgpu_connector->hpd.hpd], tmp); + dce_v10_0_hpd_int_ack(adev, amdgpu_connector->hpd.hpd); dce_v10_0_hpd_set_polarity(adev, amdgpu_connector->hpd.hpd); amdgpu_irq_get(adev, &adev->hpd_irq, amdgpu_connector->hpd.hpd); diff --git
a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.cb/drivers/gpu/drm/amd/amdgpu/dce_v11_0.cindex7af277f61cca..745e4fdffade100644 ---a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c+++b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c@@ -51,6 +51,7 @@static void dce_v11_0_set_display_funcs(struct
amdgpu_device
*adev); static voiddce_v11_0_set_irq_funcs(struct amdgpu_device *adev); +static voiddce_v11_0_hpd_int_ack(struct amdgpu_device *adev, int hpd);
static const u32 crtc_offsets[] =
{(quoted diff) +1
-0@@ -387,6 +388,7 @@ static void dce_v11_0_hpd_init(struct amdgpu_device *adev) AMDGPU_HPD_DISCONNECT_INT_DELAY_IN_MS); WREG32(mmDC_HPD_TOGGLE_FILT_CNTL + hpd_offsets[amdgpu_connector->hpd.hpd], tmp); + dce_v11_0_hpd_int_ack(adev, amdgpu_connector->hpd.hpd); dce_v11_0_hpd_set_polarity(adev, amdgpu_connector->hpd.hpd); amdgpu_irq_get(adev, &adev->hpd_irq,Quoted 6 lines
amdgpu_connector->hpd.hpd); } diff --gita/drivers/gpu/drm/amd/amdgpu/dce_v6_0.cb/drivers/gpu/drm/amd/amdgpu/dce_v6_0.cindex143efc37a17f..28c4a735716b100644 ---a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c+++b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c@@ -272,6 +272,21 @@static
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c static void dce_v6_0_hpd_init(struct
Quoted 21 lines
void dce_v6_0_hpd_set_polarity(struct
amdgpu_device*adev,WREG32(mmDC_HPD1_INT_CONTROL + hpd_offsets[hpd], tmp); }drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +14
-0+static void dce_v6_0_hpd_int_ack (struct amdgpu_device *adev, +int hpd) +{ +u32 tmp; + +if (hpd >= adev->mode_info.num_hpd) { +DRM_DEBUG ("invalid hdp %d\n" , hpd); +return ; + } + + tmp =RREG32 (mmDC_HPD1_INT_CONTROL + hpd_offsets[hpd]); + tmp |=DC_HPD1_INT_CONTROL__DC_HPD1_INT_ACK_MASK ; +WREG32 (mmDC_HPD1_INT_CONTROL + hpd_offsets[hpd], tmp); } +/** * dce_v6_0_hpd_init - hpd setup callback. * @@ -311,6 +326,7 @@ static void dce_v6_0_hpd_init(struct
amdgpu_deviceQuoted 18 lines
(quoted diff) +1
-0*adev) continue; } + dce_v6_0_hpd_int_ack(adev, amdgpu_connector->hpd.hpd); dce_v6_0_hpd_set_polarity(adev, amdgpu_connector->hpd.hpd); amdgpu_irq_get(adev, &adev->hpd_irq,
amdgpu_connector->hpd.hpd); } @@ -3088,7 +3104,7 @@ static int dce_v6_0_hpd_irq(structamdgpu_device*adev, structamdgpu_irq_src*source,struct amdgpu_iv_entry *entry) {drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +1
-2-uint32_t disp_int, mask, tmp; +uint32_t disp_int, mask;unsigned hpd; if (entry->src_data[0] >= adev->mode_info.num_hpd) { @@ -3101,9 +3117,7 @@ static int dce_v6_0_hpd_irq(struct
amdgpu_device*adev, mask = interrupt_status_offsets[hpd].hpd;Quoted 4 lines
if (disp_int & mask) {- tmp = RREG32(mmDC_HPD1_INT_CONTROL +
hpd_offsets[hpd]);
- tmp |=
DC_HPD1_INT_CONTROL__DC_HPD1_INT_ACK_MASK;Quoted 11 lines
- WREG32(mmDC_HPD1_INT_CONTROL + hpd_offsets[hpd],
tmp);drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +1
-0+dce_v6_0_hpd_int_ack (adev, hpd);schedule_delayed_work (&adev->hotplug_work,0 );DRM_DEBUG ("IH: HPD%d\n" , hpd +1 ); }(quoted diff) +0
-0
b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.cindexadeddfb7ff12..8ff2b5adfd95100644 ---a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c+++b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c@@ -264,6 +264,21 @@static
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c static void dce_v8_0_hpd_init(struct
Quoted 21 lines
void dce_v8_0_hpd_set_polarity(struct
amdgpu_device*adev,WREG32(mmDC_HPD1_INT_CONTROL + hpd_offsets[hpd], tmp); }drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +14
-0+static void dce_v8_0_hpd_int_ack (struct amdgpu_device *adev, +int hpd) +{ +u32 tmp; + +if (hpd >= adev->mode_info.num_hpd) { +DRM_DEBUG ("invalid hdp %d\n" , hpd); +return ; + } + + tmp =RREG32 (mmDC_HPD1_INT_CONTROL + hpd_offsets[hpd]); + tmp |=DC_HPD1_INT_CONTROL__DC_HPD1_INT_ACK_MASK ; +WREG32 (mmDC_HPD1_INT_CONTROL + hpd_offsets[hpd], tmp); } +/** * dce_v8_0_hpd_init - hpd setup callback. * @@ -303,6 +318,7 @@ static void dce_v8_0_hpd_init(struct
amdgpu_deviceQuoted 18 lines
(quoted diff) +1
-0*adev) continue; } + dce_v8_0_hpd_int_ack(adev, amdgpu_connector->hpd.hpd); dce_v8_0_hpd_set_polarity(adev, amdgpu_connector->hpd.hpd); amdgpu_irq_get(adev, &adev->hpd_irq,
amdgpu_connector->hpd.hpd); } @@ -3176,7 +3192,7 @@ static int dce_v8_0_hpd_irq(structamdgpu_device*adev, structamdgpu_irq_src*source,struct amdgpu_iv_entry *entry) {drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +1
-2-uint32_t disp_int, mask, tmp; +uint32_t disp_int, mask;unsigned hpd; if (entry->src_data[0] >= adev->mode_info.num_hpd) { @@ -3189,9 +3205,7 @@ static int dce_v8_0_hpd_irq(struct
amdgpu_device*adev, mask = interrupt_status_offsets[hpd].hpd;Quoted 4 lines
if (disp_int & mask) {- tmp = RREG32(mmDC_HPD1_INT_CONTROL +
hpd_offsets[hpd]);
- tmp |=
DC_HPD1_INT_CONTROL__DC_HPD1_INT_ACK_MASK;Quoted 6 lines
- WREG32(mmDC_HPD1_INT_CONTROL + hpd_offsets[hpd],
tmp);+ dce_v8_0_hpd_int_ack(adev, hpd); schedule_delayed_work(&adev->hotplug_work, 0); DRM_DEBUG("IH: HPD%d\n", hpd + 1); }
Quoted 25 lines · Qiang Ma
Quoted 21 lines · Alexander
[Public]
Quoted 12 lines
-----Original Message-----
From: Qiang Ma <[email protected]>
Sent: Wednesday, March 13, 2024 2:18 AM
To: Deucher, Alexander <[email protected]>; Koenig, Christian <[email protected]>; Pan, Xinhui <[email protected]>; [email protected]; [email protected]; SHANMUGAM, SRINIVASAN <[email protected]>; [email protected] Cc: [email protected]; [email protected]; linux- [email protected]
Subject: Re: [PATCH v2] drm/amdgpu: Clear the hotplug interrupt ack bit before hpd initializationQuoted 4 lines
On Wed, 31 Jan 2024 15:57:03 +0800
Qiang Ma <[email protected]> wrote:Hello everyone, please help review this patch.
This was applied back in January, sorry if I forget to reply.
Quoted 9 lines
Quoted 1 line
Alex
Hi, Alex, it doesn't matter, please take some time to help review this patch.
This patch mainly solves the problem that after unplugging the HDMI display during bios initialization, the display does not light up after the system starts.
I already reviewed and applied the patch. It's in mainline:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=aeaf3e6cf84282500b6fa03621b0c225ce1af18a
Alex
Quoted 190 lines
Qiang Ma
Quoted 188 lines
Quoted 186 lines
Qiang Ma
Quoted 18 lines
Problem:
The computer in the bios initialization process, unplug the HDMI display, wait until the system up, plug in the HDMI display, did not enter the hotplug interrupt function, the display is not bright.Fix:
After the above problem occurs, and the hpd ack interrupt bit is 1, the interrupt should be cleared duringhpd_initinitialization so that when the driver is ready, it can respond to the hpd interrupt normally.Signed-off-by Qiang Ma <[email protected]>---
v2:
- Remove unused variable 'tmp'
- Fixed function spelling errorsQuoted 4 lines
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 2 ++ drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 2 ++ drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 22++++++++++++++++++---
-
Quoted 2 lines
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c| 22
++++++++++++++++++----
Quoted 41 lines
4 files changed, 40 insertions(+), 8 deletions(-)(quoted diff) +0
-0
b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.cindexbb666cb7522e..12a8ba929a72100644 ---a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c+++b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c@@ -51,6 +51,7 @@static void dce_v10_0_set_display_funcs(struct
amdgpu_device
*adev); static voiddce_v10_0_set_irq_funcs(struct amdgpu_device *adev); +static voiddce_v10_0_hpd_int_ack(struct amdgpu_device *adev, int hpd);
static const u32 crtc_offsets[] = {
CRTC0_REGISTER_OFFSET,(quoted diff) +1
-0@@ -363,6 +364,7 @@ static void dce_v10_0_hpd_init(struct amdgpu_device *adev) AMDGPU_HPD_DISCONNECT_INT_DELAY_IN_MS); WREG32(mmDC_HPD_TOGGLE_FILT_CNTL + hpd_offsets[amdgpu_connector->hpd.hpd], tmp); + dce_v10_0_hpd_int_ack(adev, amdgpu_connector->hpd.hpd); dce_v10_0_hpd_set_polarity(adev, amdgpu_connector->hpd.hpd); amdgpu_irq_get(adev, &adev->hpd_irq, amdgpu_connector->hpd.hpd); diff --git
a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.cb/drivers/gpu/drm/amd/amdgpu/dce_v11_0.cindex7af277f61cca..745e4fdffade100644 ---a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c+++b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c@@ -51,6 +51,7 @@static void dce_v11_0_set_display_funcs(struct
amdgpu_device
*adev); static voiddce_v11_0_set_irq_funcs(struct amdgpu_device *adev); +static voiddce_v11_0_hpd_int_ack(struct amdgpu_device *adev, int hpd);
static const u32 crtc_offsets[] =
{(quoted diff) +1
-0@@ -387,6 +388,7 @@ static void dce_v11_0_hpd_init(struct amdgpu_device *adev) AMDGPU_HPD_DISCONNECT_INT_DELAY_IN_MS); WREG32(mmDC_HPD_TOGGLE_FILT_CNTL + hpd_offsets[amdgpu_connector->hpd.hpd], tmp); + dce_v11_0_hpd_int_ack(adev, amdgpu_connector->hpd.hpd); dce_v11_0_hpd_set_polarity(adev, amdgpu_connector->hpd.hpd); amdgpu_irq_get(adev, &adev->hpd_irq,Quoted 6 lines
amdgpu_connector->hpd.hpd); } diff --gita/drivers/gpu/drm/amd/amdgpu/dce_v6_0.cb/drivers/gpu/drm/amd/amdgpu/dce_v6_0.cindex143efc37a17f..28c4a735716b100644 ---a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c+++b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c@@ -272,6 +272,21 @@static
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c static void dce_v6_0_hpd_init(struct
Quoted 21 lines
void dce_v6_0_hpd_set_polarity(struct
amdgpu_device*adev,WREG32(mmDC_HPD1_INT_CONTROL + hpd_offsets[hpd], tmp); }drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +14
-0+static void dce_v6_0_hpd_int_ack (struct amdgpu_device *adev, +int hpd) +{ +u32 tmp; + +if (hpd >= adev->mode_info.num_hpd) { +DRM_DEBUG ("invalid hdp %d\n" , hpd); +return ; + } + + tmp =RREG32 (mmDC_HPD1_INT_CONTROL + hpd_offsets[hpd]); + tmp |=DC_HPD1_INT_CONTROL__DC_HPD1_INT_ACK_MASK ; +WREG32 (mmDC_HPD1_INT_CONTROL + hpd_offsets[hpd], tmp); } +/** * dce_v6_0_hpd_init - hpd setup callback. * @@ -311,6 +326,7 @@ static void dce_v6_0_hpd_init(struct
amdgpu_deviceQuoted 18 lines
(quoted diff) +1
-0*adev) continue; } + dce_v6_0_hpd_int_ack(adev, amdgpu_connector->hpd.hpd); dce_v6_0_hpd_set_polarity(adev, amdgpu_connector->hpd.hpd); amdgpu_irq_get(adev, &adev->hpd_irq,
amdgpu_connector->hpd.hpd); } @@ -3088,7 +3104,7 @@ static int dce_v6_0_hpd_irq(structamdgpu_device*adev, structamdgpu_irq_src*source,struct amdgpu_iv_entry *entry) {drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +1
-2-uint32_t disp_int, mask, tmp; +uint32_t disp_int, mask;unsigned hpd; if (entry->src_data[0] >= adev->mode_info.num_hpd) { @@ -3101,9 +3117,7 @@ static int dce_v6_0_hpd_irq(struct
amdgpu_device*adev, mask = interrupt_status_offsets[hpd].hpd;Quoted 4 lines
if (disp_int & mask) {- tmp = RREG32(mmDC_HPD1_INT_CONTROL +
hpd_offsets[hpd]);
- tmp |=
DC_HPD1_INT_CONTROL__DC_HPD1_INT_ACK_MASK;Quoted 11 lines
- WREG32(mmDC_HPD1_INT_CONTROL + hpd_offsets[hpd],
tmp);drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +1
-0+dce_v6_0_hpd_int_ack (adev, hpd);schedule_delayed_work (&adev->hotplug_work,0 );DRM_DEBUG ("IH: HPD%d\n" , hpd +1 ); }(quoted diff) +0
-0
b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.cindexadeddfb7ff12..8ff2b5adfd95100644 ---a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c+++b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c@@ -264,6 +264,21 @@static
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c static void dce_v8_0_hpd_init(struct
Quoted 21 lines
void dce_v8_0_hpd_set_polarity(struct
amdgpu_device*adev,WREG32(mmDC_HPD1_INT_CONTROL + hpd_offsets[hpd], tmp); }drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +14
-0+static void dce_v8_0_hpd_int_ack (struct amdgpu_device *adev, +int hpd) +{ +u32 tmp; + +if (hpd >= adev->mode_info.num_hpd) { +DRM_DEBUG ("invalid hdp %d\n" , hpd); +return ; + } + + tmp =RREG32 (mmDC_HPD1_INT_CONTROL + hpd_offsets[hpd]); + tmp |=DC_HPD1_INT_CONTROL__DC_HPD1_INT_ACK_MASK ; +WREG32 (mmDC_HPD1_INT_CONTROL + hpd_offsets[hpd], tmp); } +/** * dce_v8_0_hpd_init - hpd setup callback. * @@ -303,6 +318,7 @@ static void dce_v8_0_hpd_init(struct
amdgpu_deviceQuoted 18 lines
(quoted diff) +1
-0*adev) continue; } + dce_v8_0_hpd_int_ack(adev, amdgpu_connector->hpd.hpd); dce_v8_0_hpd_set_polarity(adev, amdgpu_connector->hpd.hpd); amdgpu_irq_get(adev, &adev->hpd_irq,
amdgpu_connector->hpd.hpd); } @@ -3176,7 +3192,7 @@ static int dce_v8_0_hpd_irq(structamdgpu_device*adev, structamdgpu_irq_src*source,struct amdgpu_iv_entry *entry) {drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +1
-2-uint32_t disp_int, mask, tmp; +uint32_t disp_int, mask;unsigned hpd; if (entry->src_data[0] >= adev->mode_info.num_hpd) { @@ -3189,9 +3205,7 @@ static int dce_v8_0_hpd_irq(struct
amdgpu_device*adev, mask = interrupt_status_offsets[hpd].hpd;Quoted 4 lines
if (disp_int & mask) {- tmp = RREG32(mmDC_HPD1_INT_CONTROL +
hpd_offsets[hpd]);
- tmp |=
DC_HPD1_INT_CONTROL__DC_HPD1_INT_ACK_MASK;Quoted 6 lines
- WREG32(mmDC_HPD1_INT_CONTROL + hpd_offsets[hpd],
tmp);+ dce_v8_0_hpd_int_ack(adev, hpd); schedule_delayed_work(&adev->hotplug_work, 0); DRM_DEBUG("IH: HPD%d\n", hpd + 1); }
Quoted 37 lines · On Tue, 26 Mar 2024 23:51:45 -0400 Alex Deucher <[email protected]> wrote:
Quoted 25 lines · Qiang Ma
Quoted 21 lines · Alexander
[Public]
Quoted 12 lines
-----Original Message-----
From: Qiang Ma <[email protected]>
Sent: Wednesday, March 13, 2024 2:18 AM
To: Deucher, Alexander <[email protected]>; Koenig, Christian <[email protected]>; Pan, Xinhui <[email protected]>; [email protected]; [email protected]; SHANMUGAM, SRINIVASAN <[email protected]>; [email protected] Cc: [email protected]; [email protected]; linux- [email protected]
Subject: Re: [PATCH v2] drm/amdgpu: Clear the hotplug interrupt ack bit before hpd initializationQuoted 4 lines
On Wed, 31 Jan 2024 15:57:03 +0800
Qiang Ma <[email protected]> wrote:Hello everyone, please help review this patch.
This was applied back in January, sorry if I forget to reply.
Quoted 9 lines
Quoted 1 line
Alex
Hi, Alex, it doesn't matter, please take some time to help review this patch.
This patch mainly solves the problem that after unplugging the HDMI display during bios initialization, the display does not light up after the system starts.
Quoted 4 lines
I already reviewed and applied the patch. It's in mainline:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=aeaf3e6cf84282500b6fa03621b0c225ce1af18aAlex
Thank you.
Qiang Ma
Quoted 192 lines
Quoted 191 lines
Qiang Ma
Quoted 188 lines
Quoted 186 lines
Qiang Ma
Quoted 18 lines
Problem:
The computer in the bios initialization process, unplug the HDMI display, wait until the system up, plug in the HDMI display, did not enter the hotplug interrupt function, the display is not bright.Fix:
After the above problem occurs, and the hpd ack interrupt bit is 1, the interrupt should be cleared duringhpd_initinitialization so that when the driver is ready, it can respond to the hpd interrupt normally.Signed-off-by Qiang Ma <[email protected]>---
v2:
- Remove unused variable 'tmp'
- Fixed function spelling errorsQuoted 4 lines
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 2 ++ drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 2 ++ drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 22++++++++++++++++++---
-
Quoted 2 lines
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c| 22
++++++++++++++++++----
Quoted 41 lines
4 files changed, 40 insertions(+), 8 deletions(-)(quoted diff) +0
-0
b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.cindexbb666cb7522e..12a8ba929a72100644 ---a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c+++b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c@@ -51,6 +51,7 @@static void dce_v10_0_set_display_funcs(struct
amdgpu_device
*adev); static voiddce_v10_0_set_irq_funcs(struct amdgpu_device *adev); +static voiddce_v10_0_hpd_int_ack(struct amdgpu_device *adev, int hpd);
static const u32 crtc_offsets[] = {
CRTC0_REGISTER_OFFSET,(quoted diff) +1
-0@@ -363,6 +364,7 @@ static void dce_v10_0_hpd_init(struct amdgpu_device *adev) AMDGPU_HPD_DISCONNECT_INT_DELAY_IN_MS); WREG32(mmDC_HPD_TOGGLE_FILT_CNTL + hpd_offsets[amdgpu_connector->hpd.hpd], tmp); + dce_v10_0_hpd_int_ack(adev, amdgpu_connector->hpd.hpd); dce_v10_0_hpd_set_polarity(adev, amdgpu_connector->hpd.hpd); amdgpu_irq_get(adev,
&adev->hpd_irq,amdgpu_connector->hpd.hpd); diff --gita/drivers/gpu/drm/amd/amdgpu/dce_v11_0.cb/drivers/gpu/drm/amd/amdgpu/dce_v11_0.cindex7af277f61cca..745e4fdffade100644 ---a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c+++b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c@@ -51,6 +51,7 @@static void dce_v11_0_set_display_funcs(struct
amdgpu_device
*adev); static voiddce_v11_0_set_irq_funcs(struct amdgpu_device *adev); +static voiddce_v11_0_hpd_int_ack(struct amdgpu_device *adev, int hpd);
static const u32 crtc_offsets[] =
{(quoted diff) +1
-0@@ -387,6 +388,7 @@ static void dce_v11_0_hpd_init(struct amdgpu_device *adev) AMDGPU_HPD_DISCONNECT_INT_DELAY_IN_MS); WREG32(mmDC_HPD_TOGGLE_FILT_CNTL + hpd_offsets[amdgpu_connector->hpd.hpd], tmp); + dce_v11_0_hpd_int_ack(adev, amdgpu_connector->hpd.hpd); dce_v11_0_hpd_set_polarity(adev, amdgpu_connector->hpd.hpd); amdgpu_irq_get(adev,Quoted 6 lines
&adev->hpd_irq,amdgpu_connector->hpd.hpd); } diff --gita/drivers/gpu/drm/amd/amdgpu/dce_v6_0.cb/drivers/gpu/drm/amd/amdgpu/dce_v6_0.cindex143efc37a17f..28c4a735716b100644 ---a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c+++b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c@@ -272,6 +272,21 @@static
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c static void dce_v6_0_hpd_init(struct
Quoted 21 lines
void dce_v6_0_hpd_set_polarity(struct
amdgpu_device*adev,WREG32(mmDC_HPD1_INT_CONTROL + hpd_offsets[hpd], tmp); }drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +14
-0+static void dce_v6_0_hpd_int_ack (struct amdgpu_device *adev, +int hpd) +{ +u32 tmp; + +if (hpd >= adev->mode_info.num_hpd) { +DRM_DEBUG ("invalid hdp %d\n" , hpd); +return ; + } + + tmp =RREG32 (mmDC_HPD1_INT_CONTROL + hpd_offsets[hpd]); + tmp |=DC_HPD1_INT_CONTROL__DC_HPD1_INT_ACK_MASK ; +WREG32 (mmDC_HPD1_INT_CONTROL + hpd_offsets[hpd], tmp); } +/** * dce_v6_0_hpd_init - hpd setup callback. * @@ -311,6 +326,7 @@ static void dce_v6_0_hpd_init(struct
amdgpu_deviceQuoted 18 lines
(quoted diff) +1
-0*adev) continue; } + dce_v6_0_hpd_int_ack(adev, amdgpu_connector->hpd.hpd); dce_v6_0_hpd_set_polarity(adev, amdgpu_connector->hpd.hpd); amdgpu_irq_get(adev,
&adev->hpd_irq,amdgpu_connector->hpd.hpd); } @@ -3088,7 +3104,7 @@ static int dce_v6_0_hpd_irq(structamdgpu_device*adev, structamdgpu_irq_src*source,struct amdgpu_iv_entry *entry) {drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +1
-2-uint32_t disp_int, mask, tmp; +uint32_t disp_int, mask;unsigned hpd; if (entry->src_data[0] >= adev->mode_info.num_hpd) { @@ -3101,9 +3117,7 @@ static int dce_v6_0_hpd_irq(struct
amdgpu_device*adev, mask = interrupt_status_offsets[hpd].hpd;Quoted 4 lines
if (disp_int & mask) {- tmp = RREG32(mmDC_HPD1_INT_CONTROL +
hpd_offsets[hpd]);
- tmp |=
DC_HPD1_INT_CONTROL__DC_HPD1_INT_ACK_MASK;Quoted 11 lines
- WREG32(mmDC_HPD1_INT_CONTROL + hpd_offsets[hpd],
tmp);drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +1
-0+dce_v6_0_hpd_int_ack (adev, hpd);schedule_delayed_work (&adev->hotplug_work,0 );DRM_DEBUG ("IH: HPD%d\n" , hpd +1 ); }(quoted diff) +0
-0
b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.cindexadeddfb7ff12..8ff2b5adfd95100644 ---a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c+++b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c@@ -264,6 +264,21 @@static
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c static void dce_v8_0_hpd_init(struct
Quoted 21 lines
void dce_v8_0_hpd_set_polarity(struct
amdgpu_device*adev,WREG32(mmDC_HPD1_INT_CONTROL + hpd_offsets[hpd], tmp); }drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +14
-0+static void dce_v8_0_hpd_int_ack (struct amdgpu_device *adev, +int hpd) +{ +u32 tmp; + +if (hpd >= adev->mode_info.num_hpd) { +DRM_DEBUG ("invalid hdp %d\n" , hpd); +return ; + } + + tmp =RREG32 (mmDC_HPD1_INT_CONTROL + hpd_offsets[hpd]); + tmp |=DC_HPD1_INT_CONTROL__DC_HPD1_INT_ACK_MASK ; +WREG32 (mmDC_HPD1_INT_CONTROL + hpd_offsets[hpd], tmp); } +/** * dce_v8_0_hpd_init - hpd setup callback. * @@ -303,6 +318,7 @@ static void dce_v8_0_hpd_init(struct
amdgpu_deviceQuoted 18 lines
(quoted diff) +1
-0*adev) continue; } + dce_v8_0_hpd_int_ack(adev, amdgpu_connector->hpd.hpd); dce_v8_0_hpd_set_polarity(adev, amdgpu_connector->hpd.hpd); amdgpu_irq_get(adev,
&adev->hpd_irq,amdgpu_connector->hpd.hpd); } @@ -3176,7 +3192,7 @@ static int dce_v8_0_hpd_irq(structamdgpu_device*adev, structamdgpu_irq_src*source,struct amdgpu_iv_entry *entry) {drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +1
-2-uint32_t disp_int, mask, tmp; +uint32_t disp_int, mask;unsigned hpd; if (entry->src_data[0] >= adev->mode_info.num_hpd) { @@ -3189,9 +3205,7 @@ static int dce_v8_0_hpd_irq(struct
amdgpu_device*adev, mask = interrupt_status_offsets[hpd].hpd;Quoted 4 lines
if (disp_int & mask) {- tmp = RREG32(mmDC_HPD1_INT_CONTROL +
hpd_offsets[hpd]);
- tmp |=
DC_HPD1_INT_CONTROL__DC_HPD1_INT_ACK_MASK;Quoted 6 lines
- WREG32(mmDC_HPD1_INT_CONTROL + hpd_offsets[hpd],
tmp);+ dce_v8_0_hpd_int_ack(adev, hpd); schedule_delayed_work(&adev->hotplug_work, 0); DRM_DEBUG("IH: HPD%d\n", hpd + 1); }