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

Commit 9857ecbe authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/nouveau: Use fb->format rather than drm_format_info() 



Let's use the pointer to the format information cached under
drm_framebuffer rather than look it up manually.

Cc: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1479498793-31021-28-git-send-email-ville.syrjala@linux.intel.com


Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent ca984a99

drivers/gpu/drm/nouveau/nv50_display.c

+5 −7
Original line number Original line Diff line number Diff line
@@ -1418,12 +1418,10 @@ static int 
nv50_base_acquire(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw,

nv50_base_acquire(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw,

		  struct nv50_head_atom *asyh)

		  struct nv50_head_atom *asyh)

{

{

	const u32 format = asyw->state.fb->pixel_format;

	const struct drm_framebuffer *fb = asyw->state.fb;

	const struct drm_format_info *info;

	int ret;

	int ret;





	info = drm_format_info(format);

	if (!fb->format->depth)

	if (!info || !info->depth)

		return -EINVAL;

		return -EINVAL;





	ret = drm_plane_helper_check_state(&asyw->state, &asyw->clip,

	ret = drm_plane_helper_check_state(&asyw->state, &asyw->clip,
@@ -1433,14 +1431,14 @@ nv50_base_acquire(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw, 
	if (ret)

	if (ret)

		return ret;

		return ret;





	asyh->base.depth = info->depth;

	asyh->base.depth = fb->format->depth;

	asyh->base.cpp = info->cpp[0];

	asyh->base.cpp = fb->format->cpp[0];

	asyh->base.x = asyw->state.src.x1 >> 16;

	asyh->base.x = asyw->state.src.x1 >> 16;

	asyh->base.y = asyw->state.src.y1 >> 16;

	asyh->base.y = asyw->state.src.y1 >> 16;

	asyh->base.w = asyw->state.fb->width;

	asyh->base.w = asyw->state.fb->width;

	asyh->base.h = asyw->state.fb->height;

	asyh->base.h = asyw->state.fb->height;





	switch (format) {

	switch (fb->pixel_format) {

	case DRM_FORMAT_C8         : asyw->image.format = 0x1e; break;

	case DRM_FORMAT_C8         : asyw->image.format = 0x1e; break;

	case DRM_FORMAT_RGB565     : asyw->image.format = 0xe8; break;

	case DRM_FORMAT_RGB565     : asyw->image.format = 0xe8; break;

	case DRM_FORMAT_XRGB1555   :

	case DRM_FORMAT_XRGB1555   :