Commit e2948682 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/fb: convert intel_framebuffer_create() to struct drm_gem_object 



Prefer the driver agnostic struct drm_gem_object over i915 specific
struct drm_i915_gem_object.

Move the declaration to the right place while at it.

Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Acked-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/5120aa0f5e49e95526b3ac20c1325bac1d95aa21.1726589119.git.jani.nikula@intel.com
parent b7095d12

drivers/gpu/drm/i915/display/intel_display.h

+0 −4
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ struct drm_encoder; 
struct drm_file;

struct drm_format_info;

struct drm_framebuffer;

struct drm_i915_gem_object;

struct drm_i915_private;

struct drm_mode_fb_cmd2;

struct drm_modeset_acquire_ctx;
@@ -493,9 +492,6 @@ int ilk_get_lanes_required(int target_clock, int link_bw, int bpp); 
void vlv_wait_port_ready(struct drm_i915_private *dev_priv,

			 struct intel_digital_port *dig_port,

			 unsigned int expected_mask);

struct drm_framebuffer *

intel_framebuffer_create(struct drm_i915_gem_object *obj,

			 struct drm_mode_fb_cmd2 *mode_cmd);



bool intel_fuzzy_clock_check(int clock1, int clock2);

drivers/gpu/drm/i915/display/intel_fb.c

+3 −3
Original line number Diff line number Diff line
@@ -2094,14 +2094,14 @@ intel_user_framebuffer_create(struct drm_device *dev, 
	if (IS_ERR(obj))

		return ERR_CAST(obj);



	fb = intel_framebuffer_create(to_intel_bo(obj), &mode_cmd);

	fb = intel_framebuffer_create(obj, &mode_cmd);

	drm_gem_object_put(obj);



	return fb;

}



struct drm_framebuffer *

intel_framebuffer_create(struct drm_i915_gem_object *obj,

intel_framebuffer_create(struct drm_gem_object *obj,

			 struct drm_mode_fb_cmd2 *mode_cmd)

{

	struct intel_framebuffer *intel_fb;
@@ -2111,7 +2111,7 @@ intel_framebuffer_create(struct drm_i915_gem_object *obj, 
	if (!intel_fb)

		return ERR_PTR(-ENOMEM);



	ret = intel_framebuffer_init(intel_fb, intel_bo_to_drm_bo(obj), mode_cmd);

	ret = intel_framebuffer_init(intel_fb, obj, mode_cmd);

	if (ret)

		goto err;

drivers/gpu/drm/i915/display/intel_fb.h

+3 −0
Original line number Diff line number Diff line
@@ -88,6 +88,9 @@ int intel_framebuffer_init(struct intel_framebuffer *ifb, 
			   struct drm_gem_object *obj,

			   struct drm_mode_fb_cmd2 *mode_cmd);

struct drm_framebuffer *

intel_framebuffer_create(struct drm_gem_object *obj,

			 struct drm_mode_fb_cmd2 *mode_cmd);

struct drm_framebuffer *

intel_user_framebuffer_create(struct drm_device *dev,

			      struct drm_file *filp,

			      const struct drm_mode_fb_cmd2 *user_mode_cmd);

drivers/gpu/drm/i915/display/intel_fbdev_fb.c

+2 −1
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 


#include "i915_drv.h"

#include "intel_display_types.h"

#include "intel_fb.h"

#include "intel_fbdev_fb.h"



struct intel_framebuffer *intel_fbdev_fb_alloc(struct drm_fb_helper *helper,
@@ -60,7 +61,7 @@ struct intel_framebuffer *intel_fbdev_fb_alloc(struct drm_fb_helper *helper, 
		return ERR_PTR(-ENOMEM);

	}



	fb = intel_framebuffer_create(obj, &mode_cmd);

	fb = intel_framebuffer_create(intel_bo_to_drm_bo(obj), &mode_cmd);

	i915_gem_object_put(obj);



	return to_intel_framebuffer(fb);

drivers/gpu/drm/xe/display/intel_fbdev_fb.c

+2 −1
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#include <drm/drm_fb_helper.h>



#include "intel_display_types.h"

#include "intel_fb.h"

#include "intel_fbdev_fb.h"

#include "xe_bo.h"

#include "xe_ttm_stolen_mgr.h"
@@ -64,7 +65,7 @@ struct intel_framebuffer *intel_fbdev_fb_alloc(struct drm_fb_helper *helper, 
		goto err;

	}



	fb = intel_framebuffer_create(obj, &mode_cmd);

	fb = intel_framebuffer_create(&obj->ttm.base, &mode_cmd);

	if (IS_ERR(fb)) {

		xe_bo_unpin_map_no_vm(obj);

		goto err;