[Freedreno] [DPU PATCH] msm/hdcp: Remove redundant stubs/CONFIG

[Sean Paul]

On Tue, Feb 27, 2018 at 11:24:31AM -0500, Sean Paul wrote:
> On Mon, Feb 26, 2018 at 03:01:14PM -0800, abhinavk at codeaurora.org wrote:
> > The change itself is okay. 

So, Reviewed-by?

Sean

> > However I am planning to do a bigger cleanup here
> > ( removing the entire hdmi_hdcp.c ).
> > 
> > We dont use this file as we have our equivalent sde_hdcp_1x.c.
> 
> Yes, we definitely need to rationalize the 2 versions. 
> 
> There's going to be a fair amount of work to get the sde/dpu version working
> with the mainline property, backwards compatible with the hdmi version that
> exists, as well as figuring out what key injection is going look like. So let's
> not disable the current thing before the next thing is ready :-)
> 
> > 
> > Was planning this cleanup as part of the HDCP 1x requirements.
> > 
> > If we want to push this as as separate change, I am okay with it but would
> > prefer to wait ...
> 
> git revert is cheap, we can always overturn it, no need to wait.
> 
> Sean
> 
> 
> 
> > 
> > Abhinav
> > On 2018-02-26 12:48, Sean Paul wrote:
> > > We already have CONFIG_DRM_MSM_HDMI_HDCP, with accompanying stubs in
> > > hdmi/hdmi.h.
> > > 
> > > Signed-off-by: Sean Paul <seanpaul at chromium.org>
> > > ---
> > >  drivers/gpu/drm/msm/hdmi/hdmi_hdcp.c | 24 ------------------------
> > >  1 file changed, 24 deletions(-)
> > > 
> > > diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_hdcp.c
> > > b/drivers/gpu/drm/msm/hdmi/hdmi_hdcp.c
> > > index d24527468284..87e3acb3a259 100644
> > > --- a/drivers/gpu/drm/msm/hdmi/hdmi_hdcp.c
> > > +++ b/drivers/gpu/drm/msm/hdmi/hdmi_hdcp.c
> > > @@ -14,7 +14,6 @@
> > >  #include "hdmi.h"
> > >  #include <linux/qcom_scm.h>
> > > 
> > > -#ifdef CONFIG_DRM_MSM_HDCP
> > >  #define HDCP_REG_ENABLE 0x01
> > >  #define HDCP_REG_DISABLE 0x00
> > >  #define HDCP_PORT_ADDR 0x74
> > > @@ -1436,26 +1435,3 @@ void msm_hdmi_hdcp_destroy(struct hdmi *hdmi)
> > >  		hdmi->hdcp_ctrl = NULL;
> > >  	}
> > >  }
> > > -
> > > -#else
> > > -struct hdmi_hdcp_ctrl *msm_hdmi_hdcp_init(struct hdmi *hdmi)
> > > -{
> > > -	return NULL;
> > > -}
> > > -
> > > -void msm_hdmi_hdcp_destroy(struct hdmi *hdmi)
> > > -{
> > > -}
> > > -
> > > -void msm_hdmi_hdcp_on(struct hdmi_hdcp_ctrl *hdcp_ctrl)
> > > -{
> > > -}
> > > -
> > > -void msm_hdmi_hdcp_off(struct hdmi_hdcp_ctrl *hdcp_ctrl)
> > > -{
> > > -}
> > > -
> > > -void msm_hdmi_hdcp_irq(struct hdmi_hdcp_ctrl *hdcp_ctrl)
> > > -{
> > > -}
> > > -#endif
> 
> -- 
> Sean Paul, Software Engineer, Google / Chromium OS

-- 
Sean Paul, Software Engineer, Google / Chromium OS