| Message ID | 1471429061-23545-1-git-send-email-daniel.vetter@ffwll.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 17 August 2016 at 11:17, Daniel Vetter <daniel.vetter@ffwll.ch> wrote: > diff --git a/Documentation/gpu/drm-kms.rst b/Documentation/gpu/drm-kms.rst > index d5ad60d3cf06..6544c74d250a 100644 > --- a/Documentation/gpu/drm-kms.rst > +++ b/Documentation/gpu/drm-kms.rst > @@ -389,6 +389,15 @@ connector and plane objects by calling the > pointer to the target object, a pointer to the previously created > property and an initial instance value. > > +Property Types and Blob Property Support > +---------------------------------------- > + > +.. kernel-doc:: include/drm/drm_property.h > + :internal: > + > +.. kernel-doc:: drivers/gpu/drm/drm_property.c > + :export: > + > Blending and Z-Position properties > ---------------------------------- Oops. :( Cheers, Daniel
diff --git a/Documentation/gpu/drm-kms.rst b/Documentation/gpu/drm-kms.rst index d5ad60d3cf06..6544c74d250a 100644 --- a/Documentation/gpu/drm-kms.rst +++ b/Documentation/gpu/drm-kms.rst @@ -389,6 +389,15 @@ connector and plane objects by calling the pointer to the target object, a pointer to the previously created property and an initial instance value. +Property Types and Blob Property Support +---------------------------------------- + +.. kernel-doc:: include/drm/drm_property.h + :internal: + +.. kernel-doc:: drivers/gpu/drm/drm_property.c + :export: + Blending and Z-Position properties ---------------------------------- diff --git a/drivers/gpu/drm/hisilicon/kirin/Kconfig b/drivers/gpu/drm/hisilicon/kirin/Kconfig index 499f64405dac..1524adcb5429 100644 --- a/drivers/gpu/drm/hisilicon/kirin/Kconfig +++ b/drivers/gpu/drm/hisilicon/kirin/Kconfig @@ -1,6 +1,7 @@ config DRM_HISI_KIRIN tristate "DRM Support for Hisilicon Kirin series SoCs Platform" - depends on DRM && OF && ARM64 + depends on DRM && OF + depends on ARM64 || (ARM && COMPILE_TEST) select DRM_KMS_HELPER select DRM_GEM_CMA_HELPER select DRM_KMS_CMA_HELPER
I just broke the build :( Cc: Xinliang Liu <z.liuxinliang@hisilicon.com> Cc: Xinwei Kong <kong.kongxinwei@hisilicon.com> Cc: Chen Feng <puck.chen@hisilicon.com> Cc: Sean Paul <seanpaul@chromium.org> Fixes: d25bcfb8c2e1 ("drm/hisilicon: Don't set drm_device->platformdev") Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> --- Documentation/gpu/drm-kms.rst | 9 +++++++++ drivers/gpu/drm/hisilicon/kirin/Kconfig | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-)