| Message ID | 20240903223803.380711-3-rodrigo.vivi@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/xe/display: Clean-up PM sequences | expand |
On Tue, 03 Sep 2024, Rodrigo Vivi <rodrigo.vivi@intel.com> wrote: > Change HAS_DISPLAY towards intel_display and remove one of the > last includes of i915_drv.h in Xe. > > Cc: Jani Nikula <jani.nikula@intel.com> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Reviewed-by: Jani Nikula <jani.nikula@intel.com> > --- > drivers/gpu/drm/xe/display/xe_display.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c > index c93b753fc88e..65331bbbc068 100644 > --- a/drivers/gpu/drm/xe/display/xe_display.c > +++ b/drivers/gpu/drm/xe/display/xe_display.c > @@ -13,7 +13,6 @@ > #include <uapi/drm/xe_drm.h> > > #include "soc/intel_dram.h" > -#include "i915_drv.h" /* FIXME: HAS_DISPLAY() depends on this */ > #include "intel_acpi.h" > #include "intel_audio.h" > #include "intel_bw.h" > @@ -34,7 +33,7 @@ > > static bool has_display(struct xe_device *xe) > { > - return HAS_DISPLAY(xe); > + return HAS_DISPLAY(&xe->display); > } > > /**
diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c index c93b753fc88e..65331bbbc068 100644 --- a/drivers/gpu/drm/xe/display/xe_display.c +++ b/drivers/gpu/drm/xe/display/xe_display.c @@ -13,7 +13,6 @@ #include <uapi/drm/xe_drm.h> #include "soc/intel_dram.h" -#include "i915_drv.h" /* FIXME: HAS_DISPLAY() depends on this */ #include "intel_acpi.h" #include "intel_audio.h" #include "intel_bw.h" @@ -34,7 +33,7 @@ static bool has_display(struct xe_device *xe) { - return HAS_DISPLAY(xe); + return HAS_DISPLAY(&xe->display); } /**
Change HAS_DISPLAY towards intel_display and remove one of the last includes of i915_drv.h in Xe. Cc: Jani Nikula <jani.nikula@intel.com> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> --- drivers/gpu/drm/xe/display/xe_display.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)