> Subject: [PATCH 1/2] drm/i915/hdcp: move i915 specific HDCP GSC > implementation to i915 > > The HDCP GSC implementation is different for both i915 and xe. Move the > i915 specific implementation from display to i915 core. > > Signed-off-by: Jani Nikula <[email protected]>
LGTM, Reviewed-by: Suraj Kandpal <[email protected]> > --- > drivers/gpu/drm/i915/Makefile | 5 ++++- > .../drm/i915/{display/intel_hdcp_gsc.c => i915_hdcp_gsc.c} | 2 +- > 2 files changed, 5 insertions(+), 2 deletions(-) rename > drivers/gpu/drm/i915/{display/intel_hdcp_gsc.c => i915_hdcp_gsc.c} (99%) > > diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile > index 2ff8938b3a7c..b2250432ae98 100644 > --- a/drivers/gpu/drm/i915/Makefile > +++ b/drivers/gpu/drm/i915/Makefile > @@ -74,6 +74,10 @@ i915-$(CONFIG_DEBUG_FS) += \ > i915-$(CONFIG_PERF_EVENTS) += \ > i915_pmu.o > > +# core display adaptation > +i915-y += \ > + i915_hdcp_gsc.o > + > # "Graphics Technology" (aka we talk to the gpu) gt-y += \ > gt/gen2_engine_cs.o \ > @@ -277,7 +281,6 @@ i915-y += \ > display/intel_frontbuffer.o \ > display/intel_global_state.o \ > display/intel_hdcp.o \ > - display/intel_hdcp_gsc.o \ > display/intel_hdcp_gsc_message.o \ > display/intel_hotplug.o \ > display/intel_hotplug_irq.o \ > diff --git a/drivers/gpu/drm/i915/display/intel_hdcp_gsc.c > b/drivers/gpu/drm/i915/i915_hdcp_gsc.c > similarity index 99% > rename from drivers/gpu/drm/i915/display/intel_hdcp_gsc.c > rename to drivers/gpu/drm/i915/i915_hdcp_gsc.c > index 3e7b480ee9f1..38df5318e13a 100644 > --- a/drivers/gpu/drm/i915/display/intel_hdcp_gsc.c > +++ b/drivers/gpu/drm/i915/i915_hdcp_gsc.c > @@ -6,11 +6,11 @@ > #include <drm/drm_print.h> > #include <drm/intel/i915_hdcp_interface.h> > > +#include "display/intel_hdcp_gsc.h" > #include "gem/i915_gem_region.h" > #include "gt/intel_gt.h" > #include "gt/uc/intel_gsc_uc_heci_cmd_submit.h" > #include "i915_drv.h" > -#include "intel_hdcp_gsc.h" > > struct intel_hdcp_gsc_context { > struct drm_i915_private *i915; > -- > 2.47.3
