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

Commit a268bcd7 authored by Daniel Stone's avatar Daniel Stone
Browse files

drm/i915: Move GEM BO inside drm_framebuffer 



Since drm_framebuffer can now store GEM objects directly, place them
there rather than in our own subclass.

v2: Only hold a single reference per framebuffer, not per plane. (Ville)
v3: Drop NULL check in intel_fb_obj. (Ville)

Signed-off-by: default avatarDaniel Stone <daniels@collabora.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Link: https://patchwork.freedesktop.org/patch/msgid/20180518143008.4120-2-daniels@collabora.com
parent a5ff7a45

drivers/gpu/drm/i915/intel_display.c

+2 −2
Original line number Diff line number Diff line
@@ -14370,9 +14370,9 @@ static int intel_framebuffer_init(struct intel_framebuffer *intel_fb, 
				      i, fb->pitches[i], stride_alignment);

			goto err;

		}

	}



	intel_fb->obj = obj;

		fb->obj[i] = &obj->base;

	}



	ret = intel_fill_fb_info(dev_priv, fb);

	if (ret)

drivers/gpu/drm/i915/intel_drv.h

+1 −2
Original line number Diff line number Diff line
@@ -194,7 +194,6 @@ enum intel_output_type { 


struct intel_framebuffer {

	struct drm_framebuffer base;

	struct drm_i915_gem_object *obj;

	struct intel_rotation_info rot_info;



	/* for each plane in the normal GTT view */
@@ -1005,7 +1004,7 @@ struct cxsr_latency { 
#define to_intel_framebuffer(x) container_of(x, struct intel_framebuffer, base)

#define to_intel_plane(x) container_of(x, struct intel_plane, base)

#define to_intel_plane_state(x) container_of(x, struct intel_plane_state, base)

#define intel_fb_obj(x) (x ? to_intel_framebuffer(x)->obj : NULL)

#define intel_fb_obj(x) ((x) ? to_intel_bo((x)->obj[0]) : NULL)



struct intel_hdmi {

	i915_reg_t hdmi_reg;