diff mbox

[8/9] ARM: multi_v7_defconfig: Replace DRM_RCAR_HDMI by generic bridge options

Message ID 1499693302-25120-9-git-send-email-geert+renesas@glider.be (mailing list archive)
State Accepted
Commit cdbacdaf89226db73aeed157d287a4702a4a09d3
Delegated to: Simon Horman
Headers show

Commit Message

Geert Uytterhoeven July 10, 2017, 1:28 p.m. UTC
The manual bridge implementation was removed in favor of the generic
one, so now we need to enable standard bridge drivers like
DRM_DUMB_VGA_DAC and DRM_I2C_ADV7511.
Both were already enabled, but the (newer) ADV7511 audio part wasn't.

Fixes: 5c602531feb3db39 ("drm: rcar-du: Replace manual bridge implementation with DRM bridge")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
multi_v7_defconfig is in desperate need of a refresh.

To reduce conflicts, I went for the simple option of adding
CONFIG_DRM_I2C_ADV7511_AUDIO below CONFIG_DRM_I2C_ADV7511, instead of
moving CONFIG_DRM_I2C_ADV7511 and CONFIG_DRM_DUMB_VGA_DAC around.
---
 arch/arm/configs/multi_v7_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Laurent Pinchart July 10, 2017, 1:41 p.m. UTC | #1
Hi Geert,

Thank you for the patch.

On Monday 10 Jul 2017 15:28:21 Geert Uytterhoeven wrote:
> The manual bridge implementation was removed in favor of the generic
> one, so now we need to enable standard bridge drivers like
> DRM_DUMB_VGA_DAC and DRM_I2C_ADV7511.
> Both were already enabled, but the (newer) ADV7511 audio part wasn't.
> 
> Fixes: 5c602531feb3db39 ("drm: rcar-du: Replace manual bridge implementation
> with DRM bridge")

I wonder if this patch really needs a Fixes tag. All it does is removing a now 
deleted kernel option, and adding a new unrelated one. The former is related 
to 5c602531feb3db39, but I'm not sure it should be considered as a bug.

The content of this patch looks good to me though.

> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> ---
> multi_v7_defconfig is in desperate need of a refresh.
> 
> To reduce conflicts, I went for the simple option of adding
> CONFIG_DRM_I2C_ADV7511_AUDIO below CONFIG_DRM_I2C_ADV7511, instead of
> moving CONFIG_DRM_I2C_ADV7511 and CONFIG_DRM_DUMB_VGA_DAC around.
> ---
>  arch/arm/configs/multi_v7_defconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/configs/multi_v7_defconfig
> b/arch/arm/configs/multi_v7_defconfig index
> 7fa1746970ecc531..ea2075d8e185f7aa 100644
> --- a/arch/arm/configs/multi_v7_defconfig
> +++ b/arch/arm/configs/multi_v7_defconfig
> @@ -584,6 +584,7 @@ CONFIG_VIDEO_ADV7180=m
>  CONFIG_VIDEO_ML86V7667=m
>  CONFIG_DRM=y
>  CONFIG_DRM_I2C_ADV7511=m
> +CONFIG_DRM_I2C_ADV7511_AUDIO=y
>  # CONFIG_DRM_I2C_CH7006 is not set
>  # CONFIG_DRM_I2C_SIL164 is not set
>  CONFIG_DRM_DUMB_VGA_DAC=m
> @@ -603,7 +604,6 @@ CONFIG_ROCKCHIP_DW_MIPI_DSI=y
>  CONFIG_ROCKCHIP_INNO_HDMI=y
>  CONFIG_DRM_ATMEL_HLCDC=m
>  CONFIG_DRM_RCAR_DU=m
> -CONFIG_DRM_RCAR_HDMI=y
>  CONFIG_DRM_RCAR_LVDS=y
>  CONFIG_DRM_SUN4I=m
>  CONFIG_DRM_TEGRA=y
Geert Uytterhoeven July 10, 2017, 2:05 p.m. UTC | #2
Hi Laurent,

On Mon, Jul 10, 2017 at 3:41 PM, Laurent Pinchart
<laurent.pinchart@ideasonboard.com> wrote:
> On Monday 10 Jul 2017 15:28:21 Geert Uytterhoeven wrote:
>> The manual bridge implementation was removed in favor of the generic
>> one, so now we need to enable standard bridge drivers like
>> DRM_DUMB_VGA_DAC and DRM_I2C_ADV7511.
>> Both were already enabled, but the (newer) ADV7511 audio part wasn't.
>>
>> Fixes: 5c602531feb3db39 ("drm: rcar-du: Replace manual bridge implementation
>> with DRM bridge")
>
> I wonder if this patch really needs a Fixes tag. All it does is removing a now
> deleted kernel option, and adding a new unrelated one. The former is related
> to 5c602531feb3db39, but I'm not sure it should be considered as a bug.

I added a Fixes tag because it aids backporting: if 5c602531feb3db39
is backported, the defconfig update should be backported, too.

> The content of this patch looks good to me though.

Thanks!

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds
diff mbox

Patch

diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 7fa1746970ecc531..ea2075d8e185f7aa 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -584,6 +584,7 @@  CONFIG_VIDEO_ADV7180=m
 CONFIG_VIDEO_ML86V7667=m
 CONFIG_DRM=y
 CONFIG_DRM_I2C_ADV7511=m
+CONFIG_DRM_I2C_ADV7511_AUDIO=y
 # CONFIG_DRM_I2C_CH7006 is not set
 # CONFIG_DRM_I2C_SIL164 is not set
 CONFIG_DRM_DUMB_VGA_DAC=m
@@ -603,7 +604,6 @@  CONFIG_ROCKCHIP_DW_MIPI_DSI=y
 CONFIG_ROCKCHIP_INNO_HDMI=y
 CONFIG_DRM_ATMEL_HLCDC=m
 CONFIG_DRM_RCAR_DU=m
-CONFIG_DRM_RCAR_HDMI=y
 CONFIG_DRM_RCAR_LVDS=y
 CONFIG_DRM_SUN4I=m
 CONFIG_DRM_TEGRA=y