From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from osg.samsung.com ([64.30.133.232]:33590 "EHLO osg.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751693AbeDERy3 (ORCPT ); Thu, 5 Apr 2018 13:54:29 -0400 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , Linux Media Mailing List , Mauro Carvalho Chehab , Bartlomiej Zolnierkiewicz , dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org Subject: [PATCH 15/16] media: omapfb_dss.h: add stubs to build with COMPILE_TEST Date: Thu, 5 Apr 2018 13:54:15 -0400 Message-Id: In-Reply-To: References: In-Reply-To: References: To: unlisted-recipients:; (no To-header on input)@bombadil.infradead.org Sender: linux-media-owner@vger.kernel.org List-ID: Add stubs for omapfb_dss.h, in the case it is included by some driver when CONFIG_FB_OMAP2 is not defined. That allows building such driver(s) with COMPILE_TEST. Signed-off-by: Mauro Carvalho Chehab --- include/video/omapfb_dss.h | 54 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 52 insertions(+), 2 deletions(-) diff --git a/include/video/omapfb_dss.h b/include/video/omapfb_dss.h index 1d38901d599d..e9775144ff3b 100644 --- a/include/video/omapfb_dss.h +++ b/include/video/omapfb_dss.h @@ -774,6 +774,12 @@ struct omap_dss_driver { const struct hdmi_avi_infoframe *avi); }; +#define for_each_dss_dev(d) while ((d = omap_dss_get_next_device(d)) != NULL) + +typedef void (*omap_dispc_isr_t) (void *arg, u32 mask); + +#ifdef CONFIG_FB_OMAP2 + enum omapdss_version omapdss_get_version(void); bool omapdss_is_initialized(void); @@ -785,7 +791,6 @@ void omapdss_unregister_display(struct omap_dss_device *dssdev); struct omap_dss_device *omap_dss_get_device(struct omap_dss_device *dssdev); void omap_dss_put_device(struct omap_dss_device *dssdev); -#define for_each_dss_dev(d) while ((d = omap_dss_get_next_device(d)) != NULL) struct omap_dss_device *omap_dss_get_next_device(struct omap_dss_device *from); struct omap_dss_device *omap_dss_find_device(void *data, int (*match)(struct omap_dss_device *dssdev, void *data)); @@ -826,7 +831,6 @@ int omapdss_default_get_recommended_bpp(struct omap_dss_device *dssdev); void omapdss_default_get_timings(struct omap_dss_device *dssdev, struct omap_video_timings *timings); -typedef void (*omap_dispc_isr_t) (void *arg, u32 mask); int omap_dispc_register_isr(omap_dispc_isr_t isr, void *arg, u32 mask); int omap_dispc_unregister_isr(omap_dispc_isr_t isr, void *arg, u32 mask); @@ -856,5 +860,51 @@ omapdss_of_get_first_endpoint(const struct device_node *parent); struct omap_dss_device * omapdss_of_find_source_for_first_ep(struct device_node *node); +#else + +static inline enum omapdss_version omapdss_get_version(void) +{ return OMAPDSS_VER_UNKNOWN; }; + +static inline bool omapdss_is_initialized(void) +{ return false; }; + +static inline int omap_dispc_register_isr(omap_dispc_isr_t isr, + void *arg, u32 mask) +{ return 0; }; + +static inline int omap_dispc_unregister_isr(omap_dispc_isr_t isr, + void *arg, u32 mask) +{ return 0; }; + +static inline struct omap_dss_device +*omap_dss_get_device(struct omap_dss_device *dssdev) +{ return NULL; }; + +static inline struct omap_dss_device +*omap_dss_get_next_device(struct omap_dss_device *from) +{return NULL; }; + +static inline void omap_dss_put_device(struct omap_dss_device *dssdev) {}; + +static inline int omapdss_compat_init(void) +{ return 0; }; + +static inline void omapdss_compat_uninit(void) {}; + +static inline int omap_dss_get_num_overlay_managers(void) +{ return 0; }; + +static inline struct omap_overlay_manager *omap_dss_get_overlay_manager(int num) +{ return NULL; }; + +static inline int omap_dss_get_num_overlays(void) +{ return 0; }; + +static inline struct omap_overlay *omap_dss_get_overlay(int num) +{ return NULL; }; + + +#endif /* FB_OMAP2 */ + #endif /* __OMAPFB_DSS_H */ -- 2.14.3 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mauro Carvalho Chehab Date: Thu, 05 Apr 2018 17:54:15 +0000 Subject: [PATCH 15/16] media: omapfb_dss.h: add stubs to build with COMPILE_TEST Message-Id: List-Id: References: In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: linux-fbdev@vger.kernel.org, Bartlomiej Zolnierkiewicz , dri-devel@lists.freedesktop.org, Mauro Carvalho Chehab , Mauro Carvalho Chehab , Linux Media Mailing List Add stubs for omapfb_dss.h, in the case it is included by some driver when CONFIG_FB_OMAP2 is not defined. That allows building such driver(s) with COMPILE_TEST. Signed-off-by: Mauro Carvalho Chehab --- include/video/omapfb_dss.h | 54 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 52 insertions(+), 2 deletions(-) diff --git a/include/video/omapfb_dss.h b/include/video/omapfb_dss.h index 1d38901d599d..e9775144ff3b 100644 --- a/include/video/omapfb_dss.h +++ b/include/video/omapfb_dss.h @@ -774,6 +774,12 @@ struct omap_dss_driver { const struct hdmi_avi_infoframe *avi); }; +#define for_each_dss_dev(d) while ((d = omap_dss_get_next_device(d)) != NULL) + +typedef void (*omap_dispc_isr_t) (void *arg, u32 mask); + +#ifdef CONFIG_FB_OMAP2 + enum omapdss_version omapdss_get_version(void); bool omapdss_is_initialized(void); @@ -785,7 +791,6 @@ void omapdss_unregister_display(struct omap_dss_device *dssdev); struct omap_dss_device *omap_dss_get_device(struct omap_dss_device *dssdev); void omap_dss_put_device(struct omap_dss_device *dssdev); -#define for_each_dss_dev(d) while ((d = omap_dss_get_next_device(d)) != NULL) struct omap_dss_device *omap_dss_get_next_device(struct omap_dss_device *from); struct omap_dss_device *omap_dss_find_device(void *data, int (*match)(struct omap_dss_device *dssdev, void *data)); @@ -826,7 +831,6 @@ int omapdss_default_get_recommended_bpp(struct omap_dss_device *dssdev); void omapdss_default_get_timings(struct omap_dss_device *dssdev, struct omap_video_timings *timings); -typedef void (*omap_dispc_isr_t) (void *arg, u32 mask); int omap_dispc_register_isr(omap_dispc_isr_t isr, void *arg, u32 mask); int omap_dispc_unregister_isr(omap_dispc_isr_t isr, void *arg, u32 mask); @@ -856,5 +860,51 @@ omapdss_of_get_first_endpoint(const struct device_node *parent); struct omap_dss_device * omapdss_of_find_source_for_first_ep(struct device_node *node); +#else + +static inline enum omapdss_version omapdss_get_version(void) +{ return OMAPDSS_VER_UNKNOWN; }; + +static inline bool omapdss_is_initialized(void) +{ return false; }; + +static inline int omap_dispc_register_isr(omap_dispc_isr_t isr, + void *arg, u32 mask) +{ return 0; }; + +static inline int omap_dispc_unregister_isr(omap_dispc_isr_t isr, + void *arg, u32 mask) +{ return 0; }; + +static inline struct omap_dss_device +*omap_dss_get_device(struct omap_dss_device *dssdev) +{ return NULL; }; + +static inline struct omap_dss_device +*omap_dss_get_next_device(struct omap_dss_device *from) +{return NULL; }; + +static inline void omap_dss_put_device(struct omap_dss_device *dssdev) {}; + +static inline int omapdss_compat_init(void) +{ return 0; }; + +static inline void omapdss_compat_uninit(void) {}; + +static inline int omap_dss_get_num_overlay_managers(void) +{ return 0; }; + +static inline struct omap_overlay_manager *omap_dss_get_overlay_manager(int num) +{ return NULL; }; + +static inline int omap_dss_get_num_overlays(void) +{ return 0; }; + +static inline struct omap_overlay *omap_dss_get_overlay(int num) +{ return NULL; }; + + +#endif /* FB_OMAP2 */ + #endif /* __OMAPFB_DSS_H */ -- 2.14.3 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mauro Carvalho Chehab Subject: [PATCH 15/16] media: omapfb_dss.h: add stubs to build with COMPILE_TEST Date: Thu, 5 Apr 2018 13:54:15 -0400 Message-ID: References: Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from osg.samsung.com (osg.samsung.com [64.30.133.232]) by gabe.freedesktop.org (Postfix) with ESMTP id A34776E827 for ; Thu, 5 Apr 2018 17:54:29 +0000 (UTC) In-Reply-To: In-Reply-To: References: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Cc: linux-fbdev@vger.kernel.org, Bartlomiej Zolnierkiewicz , dri-devel@lists.freedesktop.org, Mauro Carvalho Chehab , Mauro Carvalho Chehab , Linux Media Mailing List List-Id: dri-devel@lists.freedesktop.org QWRkIHN0dWJzIGZvciBvbWFwZmJfZHNzLmgsIGluIHRoZSBjYXNlIGl0IGlzIGluY2x1ZGVkIGJ5 CnNvbWUgZHJpdmVyIHdoZW4gQ09ORklHX0ZCX09NQVAyIGlzIG5vdCBkZWZpbmVkLgoKVGhhdCBh bGxvd3MgYnVpbGRpbmcgc3VjaCBkcml2ZXIocykgd2l0aCBDT01QSUxFX1RFU1QuCgpTaWduZWQt b2ZmLWJ5OiBNYXVybyBDYXJ2YWxobyBDaGVoYWIgPG1jaGVoYWJAcy1vcGVuc291cmNlLmNvbT4K LS0tCiBpbmNsdWRlL3ZpZGVvL29tYXBmYl9kc3MuaCB8IDU0ICsrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrLS0KIDEgZmlsZSBjaGFuZ2VkLCA1MiBpbnNlcnRpb25z KCspLCAyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2luY2x1ZGUvdmlkZW8vb21hcGZiX2Rz cy5oIGIvaW5jbHVkZS92aWRlby9vbWFwZmJfZHNzLmgKaW5kZXggMWQzODkwMWQ1OTlkLi5lOTc3 NTE0NGZmM2IgMTAwNjQ0Ci0tLSBhL2luY2x1ZGUvdmlkZW8vb21hcGZiX2Rzcy5oCisrKyBiL2lu Y2x1ZGUvdmlkZW8vb21hcGZiX2Rzcy5oCkBAIC03NzQsNiArNzc0LDEyIEBAIHN0cnVjdCBvbWFw X2Rzc19kcml2ZXIgewogCQljb25zdCBzdHJ1Y3QgaGRtaV9hdmlfaW5mb2ZyYW1lICphdmkpOwog fTsKIAorI2RlZmluZSBmb3JfZWFjaF9kc3NfZGV2KGQpIHdoaWxlICgoZCA9IG9tYXBfZHNzX2dl dF9uZXh0X2RldmljZShkKSkgIT0gTlVMTCkKKwordHlwZWRlZiB2b2lkICgqb21hcF9kaXNwY19p c3JfdCkgKHZvaWQgKmFyZywgdTMyIG1hc2spOworCisjaWZkZWYgQ09ORklHX0ZCX09NQVAyCisK IGVudW0gb21hcGRzc192ZXJzaW9uIG9tYXBkc3NfZ2V0X3ZlcnNpb24odm9pZCk7CiBib29sIG9t YXBkc3NfaXNfaW5pdGlhbGl6ZWQodm9pZCk7CiAKQEAgLTc4NSw3ICs3OTEsNiBAQCB2b2lkIG9t YXBkc3NfdW5yZWdpc3Rlcl9kaXNwbGF5KHN0cnVjdCBvbWFwX2Rzc19kZXZpY2UgKmRzc2Rldik7 CiAKIHN0cnVjdCBvbWFwX2Rzc19kZXZpY2UgKm9tYXBfZHNzX2dldF9kZXZpY2Uoc3RydWN0IG9t YXBfZHNzX2RldmljZSAqZHNzZGV2KTsKIHZvaWQgb21hcF9kc3NfcHV0X2RldmljZShzdHJ1Y3Qg b21hcF9kc3NfZGV2aWNlICpkc3NkZXYpOwotI2RlZmluZSBmb3JfZWFjaF9kc3NfZGV2KGQpIHdo aWxlICgoZCA9IG9tYXBfZHNzX2dldF9uZXh0X2RldmljZShkKSkgIT0gTlVMTCkKIHN0cnVjdCBv bWFwX2Rzc19kZXZpY2UgKm9tYXBfZHNzX2dldF9uZXh0X2RldmljZShzdHJ1Y3Qgb21hcF9kc3Nf ZGV2aWNlICpmcm9tKTsKIHN0cnVjdCBvbWFwX2Rzc19kZXZpY2UgKm9tYXBfZHNzX2ZpbmRfZGV2 aWNlKHZvaWQgKmRhdGEsCiAJCWludCAoKm1hdGNoKShzdHJ1Y3Qgb21hcF9kc3NfZGV2aWNlICpk c3NkZXYsIHZvaWQgKmRhdGEpKTsKQEAgLTgyNiw3ICs4MzEsNiBAQCBpbnQgb21hcGRzc19kZWZh dWx0X2dldF9yZWNvbW1lbmRlZF9icHAoc3RydWN0IG9tYXBfZHNzX2RldmljZSAqZHNzZGV2KTsK IHZvaWQgb21hcGRzc19kZWZhdWx0X2dldF90aW1pbmdzKHN0cnVjdCBvbWFwX2Rzc19kZXZpY2Ug KmRzc2RldiwKIAkJc3RydWN0IG9tYXBfdmlkZW9fdGltaW5ncyAqdGltaW5ncyk7CiAKLXR5cGVk ZWYgdm9pZCAoKm9tYXBfZGlzcGNfaXNyX3QpICh2b2lkICphcmcsIHUzMiBtYXNrKTsKIGludCBv bWFwX2Rpc3BjX3JlZ2lzdGVyX2lzcihvbWFwX2Rpc3BjX2lzcl90IGlzciwgdm9pZCAqYXJnLCB1 MzIgbWFzayk7CiBpbnQgb21hcF9kaXNwY191bnJlZ2lzdGVyX2lzcihvbWFwX2Rpc3BjX2lzcl90 IGlzciwgdm9pZCAqYXJnLCB1MzIgbWFzayk7CiAKQEAgLTg1Niw1ICs4NjAsNTEgQEAgb21hcGRz c19vZl9nZXRfZmlyc3RfZW5kcG9pbnQoY29uc3Qgc3RydWN0IGRldmljZV9ub2RlICpwYXJlbnQp OwogCiBzdHJ1Y3Qgb21hcF9kc3NfZGV2aWNlICoKIG9tYXBkc3Nfb2ZfZmluZF9zb3VyY2VfZm9y X2ZpcnN0X2VwKHN0cnVjdCBkZXZpY2Vfbm9kZSAqbm9kZSk7CisjZWxzZQorCitzdGF0aWMgaW5s aW5lIGVudW0gb21hcGRzc192ZXJzaW9uIG9tYXBkc3NfZ2V0X3ZlcnNpb24odm9pZCkKK3sgcmV0 dXJuIE9NQVBEU1NfVkVSX1VOS05PV047IH07CisKK3N0YXRpYyBpbmxpbmUgYm9vbCBvbWFwZHNz X2lzX2luaXRpYWxpemVkKHZvaWQpCit7IHJldHVybiBmYWxzZTsgfTsKKworc3RhdGljIGlubGlu ZSBpbnQgb21hcF9kaXNwY19yZWdpc3Rlcl9pc3Iob21hcF9kaXNwY19pc3JfdCBpc3IsCisJCQkJ CSAgdm9pZCAqYXJnLCB1MzIgbWFzaykKK3sgcmV0dXJuIDA7IH07CisKK3N0YXRpYyBpbmxpbmUg aW50IG9tYXBfZGlzcGNfdW5yZWdpc3Rlcl9pc3Iob21hcF9kaXNwY19pc3JfdCBpc3IsCisJCQkJ CSAgICB2b2lkICphcmcsIHUzMiBtYXNrKQoreyByZXR1cm4gMDsgfTsKKworc3RhdGljIGlubGlu ZSBzdHJ1Y3Qgb21hcF9kc3NfZGV2aWNlCisqb21hcF9kc3NfZ2V0X2RldmljZShzdHJ1Y3Qgb21h cF9kc3NfZGV2aWNlICpkc3NkZXYpCit7IHJldHVybiBOVUxMOyB9OworCitzdGF0aWMgaW5saW5l IHN0cnVjdCBvbWFwX2Rzc19kZXZpY2UKKypvbWFwX2Rzc19nZXRfbmV4dF9kZXZpY2Uoc3RydWN0 IG9tYXBfZHNzX2RldmljZSAqZnJvbSkKK3tyZXR1cm4gTlVMTDsgfTsKKworc3RhdGljIGlubGlu ZSB2b2lkIG9tYXBfZHNzX3B1dF9kZXZpY2Uoc3RydWN0IG9tYXBfZHNzX2RldmljZSAqZHNzZGV2 KSB7fTsKKworc3RhdGljIGlubGluZSBpbnQgb21hcGRzc19jb21wYXRfaW5pdCh2b2lkKQoreyBy ZXR1cm4gMDsgfTsKKworc3RhdGljIGlubGluZSB2b2lkIG9tYXBkc3NfY29tcGF0X3VuaW5pdCh2 b2lkKSB7fTsKKworc3RhdGljIGlubGluZSBpbnQgb21hcF9kc3NfZ2V0X251bV9vdmVybGF5X21h bmFnZXJzKHZvaWQpCit7IHJldHVybiAwOyB9OworCitzdGF0aWMgaW5saW5lIHN0cnVjdCBvbWFw X292ZXJsYXlfbWFuYWdlciAqb21hcF9kc3NfZ2V0X292ZXJsYXlfbWFuYWdlcihpbnQgbnVtKQor eyByZXR1cm4gTlVMTDsgfTsKKworc3RhdGljIGlubGluZSBpbnQgb21hcF9kc3NfZ2V0X251bV9v dmVybGF5cyh2b2lkKQoreyByZXR1cm4gMDsgfTsKKworc3RhdGljIGlubGluZSBzdHJ1Y3Qgb21h cF9vdmVybGF5ICpvbWFwX2Rzc19nZXRfb3ZlcmxheShpbnQgbnVtKQoreyByZXR1cm4gTlVMTDsg fTsKKworCisjZW5kaWYgLyogRkJfT01BUDIgKi8KKwogCiAjZW5kaWYgLyogX19PTUFQRkJfRFNT X0ggKi8KLS0gCjIuMTQuMwoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJp LWRldmVsCg==