Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23111ec3 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] cec: add cec_s_phys_addr_from_edid helper function 



This function simplifies the integration of CEC in DRM drivers.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent acec3630

Documentation/media/kapi/cec-core.rst

+8 −0
Original line number Diff line number Diff line
@@ -306,6 +306,14 @@ then the CEC adapter will be disabled. If you change a valid physical address 
to another valid physical address, then this function will first set the

address to CEC_PHYS_ADDR_INVALID before enabling the new physical address.



.. c:function::

	void cec_s_phys_addr_from_edid(struct cec_adapter *adap,

				       const struct edid *edid);



A helper function that extracts the physical address from the edid struct

and calls cec_s_phys_addr() with that address, or CEC_PHYS_ADDR_INVALID

if the EDID did not contain a physical address or edid was a NULL pointer.



.. c:function::

	int cec_s_log_addrs(struct cec_adapter *adap,

			    struct cec_log_addrs *log_addrs, bool block);

drivers/media/cec/cec-adap.c

+14 −0
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ 
#include <linux/string.h>

#include <linux/types.h>



#include <drm/drm_edid.h>



#include "cec-priv.h"



static void cec_fill_msg_report_features(struct cec_adapter *adap,
@@ -1408,6 +1410,18 @@ void cec_s_phys_addr(struct cec_adapter *adap, u16 phys_addr, bool block) 
}

EXPORT_SYMBOL_GPL(cec_s_phys_addr);



void cec_s_phys_addr_from_edid(struct cec_adapter *adap,

			       const struct edid *edid)

{

	u16 pa = CEC_PHYS_ADDR_INVALID;



	if (edid && edid->extensions)

		pa = cec_get_edid_phys_addr((const u8 *)edid,

				EDID_LENGTH * (edid->extensions + 1), NULL);

	cec_s_phys_addr(adap, pa, false);

}

EXPORT_SYMBOL_GPL(cec_s_phys_addr_from_edid);



/*

 * Called from either the ioctl or a driver to set the logical addresses.

 *

include/media/cec.h

+9 −0
Original line number Diff line number Diff line
@@ -206,6 +206,8 @@ static inline bool cec_is_sink(const struct cec_adapter *adap) 
#define cec_phys_addr_exp(pa) \

	((pa) >> 12), ((pa) >> 8) & 0xf, ((pa) >> 4) & 0xf, (pa) & 0xf



struct edid;



#if IS_ENABLED(CONFIG_CEC_CORE)

struct cec_adapter *cec_allocate_adapter(const struct cec_adap_ops *ops,

		void *priv, const char *name, u32 caps, u8 available_las);
@@ -217,6 +219,8 @@ int cec_s_log_addrs(struct cec_adapter *adap, struct cec_log_addrs *log_addrs, 
		    bool block);

void cec_s_phys_addr(struct cec_adapter *adap, u16 phys_addr,

		     bool block);

void cec_s_phys_addr_from_edid(struct cec_adapter *adap,

			       const struct edid *edid);

int cec_transmit_msg(struct cec_adapter *adap, struct cec_msg *msg,

		     bool block);
@@ -326,6 +330,11 @@ static inline void cec_s_phys_addr(struct cec_adapter *adap, u16 phys_addr, 
{

}



static inline void cec_s_phys_addr_from_edid(struct cec_adapter *adap,

					     const struct edid *edid)

{

}



static inline u16 cec_get_edid_phys_addr(const u8 *edid, unsigned int size,

					 unsigned int *offset)

{