| Message ID | 20220506123246.21788-1-yuehaibing@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2,-next] drm/display: Fix build error without CONFIG_OF | expand |
On 06/05/2022 15:32, YueHaibing wrote: > While CONFIG_OF is n but COMPILE_TEST is y, we got this: > > WARNING: unmet direct dependencies detected for DRM_DP_AUX_BUS > Depends on [n]: HAS_IOMEM [=y] && DRM [=y] && OF [=n] > Selected by [y]: > - DRM_MSM [=y] && HAS_IOMEM [=y] && DRM [=y] && (ARCH_QCOM || SOC_IMX5 || COMPILE_TEST [=y]) && COMMON_CLK [=y] && IOMMU_SUPPORT [=y] && (QCOM_OCMEM [=n] || QCOM_OCMEM [=n]=n) && (QCOM_LLCC [=y] || QCOM_LLCC [=y]=n) && (QCOM_COMMAND_DB [=n] || QCOM_COMMAND_DB [=n]=n) > > Make DRM_DP_AUX_BUS depends on OF || COMPILE_TEST to fix this warning. > > Fixes: f5d01644921b ("drm/msm: select DRM_DP_AUX_BUS for the AUX bus support") > Signed-off-by: YueHaibing <yuehaibing@huawei.com> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > --- > v2: fix this in DRM_DP_AUX_BUS dependencies > --- > drivers/gpu/drm/display/Kconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/display/Kconfig b/drivers/gpu/drm/display/Kconfig > index 1b6e6af37546..09712b88a5b8 100644 > --- a/drivers/gpu/drm/display/Kconfig > +++ b/drivers/gpu/drm/display/Kconfig > @@ -3,7 +3,7 @@ > config DRM_DP_AUX_BUS > tristate > depends on DRM > - depends on OF > + depends on OF || COMPILE_TEST > > config DRM_DISPLAY_HELPER > tristate
On 5/6/2022 5:32 AM, YueHaibing wrote: > While CONFIG_OF is n but COMPILE_TEST is y, we got this: > > WARNING: unmet direct dependencies detected for DRM_DP_AUX_BUS > Depends on [n]: HAS_IOMEM [=y] && DRM [=y] && OF [=n] > Selected by [y]: > - DRM_MSM [=y] && HAS_IOMEM [=y] && DRM [=y] && (ARCH_QCOM || SOC_IMX5 || COMPILE_TEST [=y]) && COMMON_CLK [=y] && IOMMU_SUPPORT [=y] && (QCOM_OCMEM [=n] || QCOM_OCMEM [=n]=n) && (QCOM_LLCC [=y] || QCOM_LLCC [=y]=n) && (QCOM_COMMAND_DB [=n] || QCOM_COMMAND_DB [=n]=n) > > Make DRM_DP_AUX_BUS depends on OF || COMPILE_TEST to fix this warning. > > Fixes: f5d01644921b ("drm/msm: select DRM_DP_AUX_BUS for the AUX bus support") > Signed-off-by: YueHaibing <yuehaibing@huawei.com> Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com> > --- > v2: fix this in DRM_DP_AUX_BUS dependencies > --- > drivers/gpu/drm/display/Kconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/display/Kconfig b/drivers/gpu/drm/display/Kconfig > index 1b6e6af37546..09712b88a5b8 100644 > --- a/drivers/gpu/drm/display/Kconfig > +++ b/drivers/gpu/drm/display/Kconfig > @@ -3,7 +3,7 @@ > config DRM_DP_AUX_BUS > tristate > depends on DRM > - depends on OF > + depends on OF || COMPILE_TEST > > config DRM_DISPLAY_HELPER > tristate
ping... On 2022/5/6 20:32, YueHaibing wrote: > While CONFIG_OF is n but COMPILE_TEST is y, we got this: > > WARNING: unmet direct dependencies detected for DRM_DP_AUX_BUS > Depends on [n]: HAS_IOMEM [=y] && DRM [=y] && OF [=n] > Selected by [y]: > - DRM_MSM [=y] && HAS_IOMEM [=y] && DRM [=y] && (ARCH_QCOM || SOC_IMX5 || COMPILE_TEST [=y]) && COMMON_CLK [=y] && IOMMU_SUPPORT [=y] && (QCOM_OCMEM [=n] || QCOM_OCMEM [=n]=n) && (QCOM_LLCC [=y] || QCOM_LLCC [=y]=n) && (QCOM_COMMAND_DB [=n] || QCOM_COMMAND_DB [=n]=n) > > Make DRM_DP_AUX_BUS depends on OF || COMPILE_TEST to fix this warning. > > Fixes: f5d01644921b ("drm/msm: select DRM_DP_AUX_BUS for the AUX bus support") > Signed-off-by: YueHaibing <yuehaibing@huawei.com> > --- > v2: fix this in DRM_DP_AUX_BUS dependencies > --- > drivers/gpu/drm/display/Kconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/display/Kconfig b/drivers/gpu/drm/display/Kconfig > index 1b6e6af37546..09712b88a5b8 100644 > --- a/drivers/gpu/drm/display/Kconfig > +++ b/drivers/gpu/drm/display/Kconfig > @@ -3,7 +3,7 @@ > config DRM_DP_AUX_BUS > tristate > depends on DRM > - depends on OF > + depends on OF || COMPILE_TEST > > config DRM_DISPLAY_HELPER > tristate >
On Fri, May 6, 2022 at 2:33 PM YueHaibing <yuehaibing@huawei.com> wrote: > While CONFIG_OF is n but COMPILE_TEST is y, we got this: > > WARNING: unmet direct dependencies detected for DRM_DP_AUX_BUS > Depends on [n]: HAS_IOMEM [=y] && DRM [=y] && OF [=n] > Selected by [y]: > - DRM_MSM [=y] && HAS_IOMEM [=y] && DRM [=y] && (ARCH_QCOM || SOC_IMX5 || COMPILE_TEST [=y]) && COMMON_CLK [=y] && IOMMU_SUPPORT [=y] && (QCOM_OCMEM [=n] || QCOM_OCMEM [=n]=n) && (QCOM_LLCC [=y] || QCOM_LLCC [=y]=n) && (QCOM_COMMAND_DB [=n] || QCOM_COMMAND_DB [=n]=n) > > Make DRM_DP_AUX_BUS depends on OF || COMPILE_TEST to fix this warning. > > Fixes: f5d01644921b ("drm/msm: select DRM_DP_AUX_BUS for the AUX bus support") > Signed-off-by: YueHaibing <yuehaibing@huawei.com> Patch applied to the DRM tree. Yours, Linus Walleij
On Mon, May 23, 2022 at 2:46 PM Linus Walleij <linus.walleij@linaro.org> wrote: > On Fri, May 6, 2022 at 2:33 PM YueHaibing <yuehaibing@huawei.com> wrote: > > > While CONFIG_OF is n but COMPILE_TEST is y, we got this: > > > > WARNING: unmet direct dependencies detected for DRM_DP_AUX_BUS > > Depends on [n]: HAS_IOMEM [=y] && DRM [=y] && OF [=n] > > Selected by [y]: > > - DRM_MSM [=y] && HAS_IOMEM [=y] && DRM [=y] && (ARCH_QCOM || SOC_IMX5 || COMPILE_TEST [=y]) && COMMON_CLK [=y] && IOMMU_SUPPORT [=y] && (QCOM_OCMEM [=n] || QCOM_OCMEM [=n]=n) && (QCOM_LLCC [=y] || QCOM_LLCC [=y]=n) && (QCOM_COMMAND_DB [=n] || QCOM_COMMAND_DB [=n]=n) > > > > Make DRM_DP_AUX_BUS depends on OF || COMPILE_TEST to fix this warning. > > > > Fixes: f5d01644921b ("drm/msm: select DRM_DP_AUX_BUS for the AUX bus support") > > Signed-off-by: YueHaibing <yuehaibing@huawei.com> > > Patch applied to the DRM tree. Nope, failed: $ dim push-branch drm-misc-next dim: ac890b9eeb9b ("drm/display: Fix build error without CONFIG_OF"): Fixes: SHA1 in not pointing at an ancestor: dim: f5d01644921b ("drm/msm: select DRM_DP_AUX_BUS for the AUX bus support") dim: ERROR: issues in commits detected, aborting I don't know what to do with this, sorry. The other committers are maybe better with this kind of situations. I think it is designed to stop me from shooting myself in the foot. Yours, Linus Walleij
On 23/05/2022 15:54, Linus Walleij wrote: > On Mon, May 23, 2022 at 2:46 PM Linus Walleij <linus.walleij@linaro.org> wrote: >> On Fri, May 6, 2022 at 2:33 PM YueHaibing <yuehaibing@huawei.com> wrote: >> >>> While CONFIG_OF is n but COMPILE_TEST is y, we got this: >>> >>> WARNING: unmet direct dependencies detected for DRM_DP_AUX_BUS >>> Depends on [n]: HAS_IOMEM [=y] && DRM [=y] && OF [=n] >>> Selected by [y]: >>> - DRM_MSM [=y] && HAS_IOMEM [=y] && DRM [=y] && (ARCH_QCOM || SOC_IMX5 || COMPILE_TEST [=y]) && COMMON_CLK [=y] && IOMMU_SUPPORT [=y] && (QCOM_OCMEM [=n] || QCOM_OCMEM [=n]=n) && (QCOM_LLCC [=y] || QCOM_LLCC [=y]=n) && (QCOM_COMMAND_DB [=n] || QCOM_COMMAND_DB [=n]=n) >>> >>> Make DRM_DP_AUX_BUS depends on OF || COMPILE_TEST to fix this warning. >>> >>> Fixes: f5d01644921b ("drm/msm: select DRM_DP_AUX_BUS for the AUX bus support") >>> Signed-off-by: YueHaibing <yuehaibing@huawei.com> >> >> Patch applied to the DRM tree. > > Nope, failed: > > $ dim push-branch drm-misc-next > dim: ac890b9eeb9b ("drm/display: Fix build error without CONFIG_OF"): > Fixes: SHA1 in not pointing at an ancestor: > dim: f5d01644921b ("drm/msm: select DRM_DP_AUX_BUS for the AUX bus support") > dim: ERROR: issues in commits detected, aborting > > I don't know what to do with this, sorry. The other committers are maybe better > with this kind of situations. I think it is designed to stop me from > shooting myself > in the foot. It 'Fixes' a commit in the drm/msm tree, however a fix is not msm-specific. We can push it out through the drm/msm, but we'd need an ack from drm/core.
On Mon, 23 May 2022 at 15:55, Linus Walleij <linus.walleij@linaro.org> wrote: > > On Mon, May 23, 2022 at 2:46 PM Linus Walleij <linus.walleij@linaro.org> wrote: > > On Fri, May 6, 2022 at 2:33 PM YueHaibing <yuehaibing@huawei.com> wrote: > > > > > While CONFIG_OF is n but COMPILE_TEST is y, we got this: > > > > > > WARNING: unmet direct dependencies detected for DRM_DP_AUX_BUS > > > Depends on [n]: HAS_IOMEM [=y] && DRM [=y] && OF [=n] > > > Selected by [y]: > > > - DRM_MSM [=y] && HAS_IOMEM [=y] && DRM [=y] && (ARCH_QCOM || SOC_IMX5 || COMPILE_TEST [=y]) && COMMON_CLK [=y] && IOMMU_SUPPORT [=y] && (QCOM_OCMEM [=n] || QCOM_OCMEM [=n]=n) && (QCOM_LLCC [=y] || QCOM_LLCC [=y]=n) && (QCOM_COMMAND_DB [=n] || QCOM_COMMAND_DB [=n]=n) > > > > > > Make DRM_DP_AUX_BUS depends on OF || COMPILE_TEST to fix this warning. > > > > > > Fixes: f5d01644921b ("drm/msm: select DRM_DP_AUX_BUS for the AUX bus support") > > > Signed-off-by: YueHaibing <yuehaibing@huawei.com> > > > > Patch applied to the DRM tree. > > Nope, failed: > > $ dim push-branch drm-misc-next > dim: ac890b9eeb9b ("drm/display: Fix build error without CONFIG_OF"): > Fixes: SHA1 in not pointing at an ancestor: > dim: f5d01644921b ("drm/msm: select DRM_DP_AUX_BUS for the AUX bus support") > dim: ERROR: issues in commits detected, aborting > > I don't know what to do with this, sorry. The other committers are maybe better > with this kind of situations. I think it is designed to stop me from > shooting myself > in the foot. Linus, can we get an ack from you (or anybody else from DRM core) to merge it through drm/msm tree?
Hi Linus, Yue, On 23/05/2022 15:54, Linus Walleij wrote: > On Mon, May 23, 2022 at 2:46 PM Linus Walleij <linus.walleij@linaro.org> wrote: >> On Fri, May 6, 2022 at 2:33 PM YueHaibing <yuehaibing@huawei.com> wrote: >> >>> While CONFIG_OF is n but COMPILE_TEST is y, we got this: >>> >>> WARNING: unmet direct dependencies detected for DRM_DP_AUX_BUS >>> Depends on [n]: HAS_IOMEM [=y] && DRM [=y] && OF [=n] >>> Selected by [y]: >>> - DRM_MSM [=y] && HAS_IOMEM [=y] && DRM [=y] && (ARCH_QCOM || SOC_IMX5 || COMPILE_TEST [=y]) && COMMON_CLK [=y] && IOMMU_SUPPORT [=y] && (QCOM_OCMEM [=n] || QCOM_OCMEM [=n]=n) && (QCOM_LLCC [=y] || QCOM_LLCC [=y]=n) && (QCOM_COMMAND_DB [=n] || QCOM_COMMAND_DB [=n]=n) >>> >>> Make DRM_DP_AUX_BUS depends on OF || COMPILE_TEST to fix this warning. >>> >>> Fixes: f5d01644921b ("drm/msm: select DRM_DP_AUX_BUS for the AUX bus support") >>> Signed-off-by: YueHaibing <yuehaibing@huawei.com> >> >> Patch applied to the DRM tree. > > Nope, failed: > > $ dim push-branch drm-misc-next > dim: ac890b9eeb9b ("drm/display: Fix build error without CONFIG_OF"): > Fixes: SHA1 in not pointing at an ancestor: > dim: f5d01644921b ("drm/msm: select DRM_DP_AUX_BUS for the AUX bus support") > dim: ERROR: issues in commits detected, aborting After a second thought, I think the patch contains wrong Fixes tag. It should be: Fixes: 1e0f66420b13 ("drm/display: Introduce a DRM display-helper module") With that in place would we be able to merge it through drm-misc? Does it needs to be resubmitted? > > I don't know what to do with this, sorry. The other committers are maybe better > with this kind of situations. I think it is designed to stop me from > shooting myself > in the foot. > > Yours, > Linus Walleij
On Wed, May 25, 2022 at 3:36 PM Dmitry Baryshkov <dmitry.baryshkov@linaro.org> wrote: > On Mon, 23 May 2022 at 15:55, Linus Walleij <linus.walleij@linaro.org> wrote: > > Nope, failed: > > > > $ dim push-branch drm-misc-next > > dim: ac890b9eeb9b ("drm/display: Fix build error without CONFIG_OF"): > > Fixes: SHA1 in not pointing at an ancestor: > > dim: f5d01644921b ("drm/msm: select DRM_DP_AUX_BUS for the AUX bus support") > > dim: ERROR: issues in commits detected, aborting > > > > I don't know what to do with this, sorry. The other committers are maybe better > > with this kind of situations. I think it is designed to stop me from > > shooting myself > > in the foot. > > Linus, can we get an ack from you (or anybody else from DRM core) to > merge it through drm/msm tree? Acked-by: Linus Walleij <linus.walleij@linaro.org> > After a second thought, I think the patch contains wrong Fixes tag. It > should be: > > Fixes: 1e0f66420b13 ("drm/display: Introduce a DRM display-helper module") > > With that in place would we be able to merge it through drm-misc? Does > it needs to be resubmitted? But it doesn't apply to drm-misc... that's my problem :/ Yours, Linus Walleij
On 26/05/2022 23:08, Linus Walleij wrote: > On Wed, May 25, 2022 at 3:36 PM Dmitry Baryshkov > <dmitry.baryshkov@linaro.org> wrote: >> On Mon, 23 May 2022 at 15:55, Linus Walleij <linus.walleij@linaro.org> wrote: > >>> Nope, failed: >>> >>> $ dim push-branch drm-misc-next >>> dim: ac890b9eeb9b ("drm/display: Fix build error without CONFIG_OF"): >>> Fixes: SHA1 in not pointing at an ancestor: >>> dim: f5d01644921b ("drm/msm: select DRM_DP_AUX_BUS for the AUX bus support") >>> dim: ERROR: issues in commits detected, aborting >>> >>> I don't know what to do with this, sorry. The other committers are maybe better >>> with this kind of situations. I think it is designed to stop me from >>> shooting myself >>> in the foot. >> >> Linus, can we get an ack from you (or anybody else from DRM core) to >> merge it through drm/msm tree? > > Acked-by: Linus Walleij <linus.walleij@linaro.org> > >> After a second thought, I think the patch contains wrong Fixes tag. It >> should be: >> >> Fixes: 1e0f66420b13 ("drm/display: Introduce a DRM display-helper module") >> >> With that in place would we be able to merge it through drm-misc? Does >> it needs to be resubmitted? > > But it doesn't apply to drm-misc... that's my problem :/ I think it didn't apply because of the Fixes from msm-next. If we change that to the mentioned commit (1e0f66420b13), then you should be able to push it.
diff --git a/drivers/gpu/drm/display/Kconfig b/drivers/gpu/drm/display/Kconfig index 1b6e6af37546..09712b88a5b8 100644 --- a/drivers/gpu/drm/display/Kconfig +++ b/drivers/gpu/drm/display/Kconfig @@ -3,7 +3,7 @@ config DRM_DP_AUX_BUS tristate depends on DRM - depends on OF + depends on OF || COMPILE_TEST config DRM_DISPLAY_HELPER tristate
While CONFIG_OF is n but COMPILE_TEST is y, we got this: WARNING: unmet direct dependencies detected for DRM_DP_AUX_BUS Depends on [n]: HAS_IOMEM [=y] && DRM [=y] && OF [=n] Selected by [y]: - DRM_MSM [=y] && HAS_IOMEM [=y] && DRM [=y] && (ARCH_QCOM || SOC_IMX5 || COMPILE_TEST [=y]) && COMMON_CLK [=y] && IOMMU_SUPPORT [=y] && (QCOM_OCMEM [=n] || QCOM_OCMEM [=n]=n) && (QCOM_LLCC [=y] || QCOM_LLCC [=y]=n) && (QCOM_COMMAND_DB [=n] || QCOM_COMMAND_DB [=n]=n) Make DRM_DP_AUX_BUS depends on OF || COMPILE_TEST to fix this warning. Fixes: f5d01644921b ("drm/msm: select DRM_DP_AUX_BUS for the AUX bus support") Signed-off-by: YueHaibing <yuehaibing@huawei.com> --- v2: fix this in DRM_DP_AUX_BUS dependencies --- drivers/gpu/drm/display/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)