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

Commit 1a9807ea authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm/sde: set bus attributes correctly for inline rotatation" into msm-4.9

parents 105078d6 d02440be

drivers/gpu/drm/msm/sde/sde_kms.c

+12 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 


#include "msm_drv.h"

#include "msm_mmu.h"

#include "msm_gem.h"



#include "dsi_display.h"

#include "dsi_drm.h"
@@ -955,6 +956,13 @@ static void sde_kms_fbo_destroy(struct sde_kms_fbo *fbo) 
	}

}



static void sde_kms_set_gem_flags(struct msm_gem_object *msm_obj,

		uint32_t flags)

{

	if (msm_obj)

		msm_obj->flags |= flags;

}



struct sde_kms_fbo *sde_kms_fbo_alloc(struct drm_device *dev, u32 width,

		u32 height, u32 pixel_format, u64 modifier[4], u32 flags)

{
@@ -1041,10 +1049,13 @@ struct sde_kms_fbo *sde_kms_fbo_alloc(struct drm_device *dev, u32 width, 
			fbo->bo[0] = NULL;

			goto done;

		}



		/* insert extra bo flags */

		sde_kms_set_gem_flags(to_msm_bo(fbo->bo[0]), MSM_BO_KEEPATTRS);

	} else {

		mutex_lock(&dev->struct_mutex);

		fbo->bo[0] = msm_gem_new(dev, fbo->layout.total_size,

				MSM_BO_SCANOUT | MSM_BO_WC);

				MSM_BO_SCANOUT | MSM_BO_WC | MSM_BO_KEEPATTRS);

		if (IS_ERR(fbo->bo[0])) {

			mutex_unlock(&dev->struct_mutex);

			SDE_ERROR("failed to new gem buffer\n");

drivers/gpu/drm/msm/sde/sde_plane.c

+1 −1
Original line number Diff line number Diff line
@@ -3010,7 +3010,7 @@ static int sde_plane_sspp_atomic_update(struct drm_plane *plane, 
						SDE_PIPE_SC_OP_MODE_OFFLINE;

				pstate->sc_cfg.rd_en = false;

				pstate->sc_cfg.rd_scid = 0;

				pstate->sc_cfg.rd_noallocate = false;

				pstate->sc_cfg.rd_noallocate = true;

				pstate->sc_cfg.rd_op_type =

					SDE_PIPE_SC_RD_OP_TYPE_CACHEABLE;

			}