[Intel-xe] [PATCH] fixup! FIXME: drm/i915/display: Remaining changes to make xe compile
Jani Nikula
jani.nikula at intel.com
Fri Dec 1 13:44:32 UTC 2023
On Fri, 01 Dec 2023, Jouni Högander <jouni.hogander at intel.com> wrote:
> Remove bunch of unnecessary changes from the hack patch.
>
> Signed-off-by: Jouni Högander <jouni.hogander at intel.com>
Acked-by: Jani Nikula <jani.nikula at intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_atomic_plane.c | 8 ++++----
> drivers/gpu/drm/i915/display/intel_fbc.c | 2 --
> drivers/gpu/drm/i915/display/intel_frontbuffer.c | 7 ++++---
> drivers/gpu/drm/i915/display/intel_frontbuffer.h | 4 ----
> 4 files changed, 8 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_atomic_plane.c b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
> index a8f36ca11e2e..06c2455bdd78 100644
> --- a/drivers/gpu/drm/i915/display/intel_atomic_plane.c
> +++ b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
> @@ -1066,10 +1066,10 @@ static int
> intel_prepare_plane_fb(struct drm_plane *_plane,
> struct drm_plane_state *_new_plane_state)
> {
> - struct intel_plane_state *new_plane_state =
> - to_intel_plane_state(_new_plane_state);
> struct i915_sched_attr attr = { .priority = I915_PRIORITY_DISPLAY };
> struct intel_plane *plane = to_intel_plane(_plane);
> + struct intel_plane_state *new_plane_state =
> + to_intel_plane_state(_new_plane_state);
> struct intel_atomic_state *state =
> to_intel_atomic_state(new_plane_state->uapi.state);
> struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
> @@ -1153,9 +1153,9 @@ intel_cleanup_plane_fb(struct drm_plane *plane,
> {
> struct intel_plane_state *old_plane_state =
> to_intel_plane_state(_old_plane_state);
> - __maybe_unused struct intel_atomic_state *state =
> + struct intel_atomic_state *state =
> to_intel_atomic_state(old_plane_state->uapi.state);
> - __maybe_unused struct drm_i915_private *dev_priv = to_i915(plane->dev);
> + struct drm_i915_private *dev_priv = to_i915(plane->dev);
> struct drm_i915_gem_object *obj = intel_fb_obj(old_plane_state->hw.fb);
>
> if (!obj)
> diff --git a/drivers/gpu/drm/i915/display/intel_fbc.c b/drivers/gpu/drm/i915/display/intel_fbc.c
> index 1152bd4cb8f8..32de94e0e69e 100644
> --- a/drivers/gpu/drm/i915/display/intel_fbc.c
> +++ b/drivers/gpu/drm/i915/display/intel_fbc.c
> @@ -453,7 +453,6 @@ static void g4x_fbc_program_cfb(struct intel_fbc *fbc)
>
> intel_de_write(i915, DPFC_CB_BASE,
> i915_gem_stolen_node_offset(&fbc->compressed_fb));
> -
> }
>
> static const struct intel_fbc_funcs g4x_fbc_funcs = {
> @@ -800,7 +799,6 @@ static int intel_fbc_alloc_cfb(struct intel_fbc *fbc,
> drm_dbg_kms(&i915->drm,
> "reserved %llu bytes of contiguous stolen space for FBC, limit: %d\n",
> i915_gem_stolen_node_size(&fbc->compressed_fb), fbc->limit);
> -
> return 0;
>
> err_llb:
> diff --git a/drivers/gpu/drm/i915/display/intel_frontbuffer.c b/drivers/gpu/drm/i915/display/intel_frontbuffer.c
> index d64ce5bfeca8..2ea37c0414a9 100644
> --- a/drivers/gpu/drm/i915/display/intel_frontbuffer.c
> +++ b/drivers/gpu/drm/i915/display/intel_frontbuffer.c
> @@ -190,7 +190,7 @@ void __intel_fb_flush(struct intel_frontbuffer *front,
> enum fb_op_origin origin,
> unsigned int frontbuffer_bits)
> {
> - struct drm_i915_private *i915 = intel_bo_to_i915((front->obj));
> + struct drm_i915_private *i915 = intel_bo_to_i915(front->obj);
>
> if (origin == ORIGIN_CS) {
> spin_lock(&i915->display.fb_tracking.lock);
> @@ -259,6 +259,7 @@ static void frontbuffer_release(struct kref *ref)
> drm_WARN_ON(&intel_bo_to_i915(obj)->drm, atomic_read(&front->bits));
>
> i915_ggtt_clear_scanout(obj);
> +
> ret = i915_gem_object_set_frontbuffer(obj, NULL);
> drm_WARN_ON(&intel_bo_to_i915(obj)->drm, ret);
> spin_unlock(&intel_bo_to_i915(obj)->display.fb_tracking.lock);
> @@ -289,12 +290,12 @@ intel_frontbuffer_get(struct drm_i915_gem_object *obj)
> frontbuffer_retire,
> I915_ACTIVE_RETIRE_SLEEPS);
> INIT_WORK(&front->flush_work, intel_frontbuffer_flush_work);
> +
> spin_lock(&i915->display.fb_tracking.lock);
> cur = i915_gem_object_set_frontbuffer(obj, front);
> spin_unlock(&i915->display.fb_tracking.lock);
> if (cur != front)
> kfree(front);
> -
> return cur;
> }
>
> @@ -337,7 +338,7 @@ void intel_frontbuffer_track(struct intel_frontbuffer *old,
> }
>
> if (new) {
> - drm_WARN_ON(&intel_bo_to_i915(old->obj)->drm,
> + drm_WARN_ON(&intel_bo_to_i915(new->obj)->drm,
> atomic_read(&new->bits) & frontbuffer_bits);
> atomic_or(frontbuffer_bits, &new->bits);
> }
> diff --git a/drivers/gpu/drm/i915/display/intel_frontbuffer.h b/drivers/gpu/drm/i915/display/intel_frontbuffer.h
> index 00467d513e74..abb51e8bb920 100644
> --- a/drivers/gpu/drm/i915/display/intel_frontbuffer.h
> +++ b/drivers/gpu/drm/i915/display/intel_frontbuffer.h
> @@ -28,10 +28,6 @@
> #include <linux/bits.h>
> #include <linux/kref.h>
>
> -#ifndef I915
> -#include "xe_bo.h"
> -#endif
> -
> #include "i915_active_types.h"
>
> struct drm_i915_private;
--
Jani Nikula, Intel
More information about the Intel-xe
mailing list