On Mon, 12 Apr 2021, Ville Syrjala <ville.syrjala@xxxxxxxxxxxxxxx> wrote: > From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > > Fix a couple of regressions due to the glk display version 9->10 > change. I *think* all the ones that slipped through involved > either DISPLAY_VER==9 or DISPLAY_VER<10 checks. These three > regressions are the ones I found through a quick scan, but someone > should probably go through the whole tree with a fine toothcomb > in case we missed more cases. > > Also tossed in a couple of cleanups. Ville, please hold on with merging this until we figure out how to merge [1]. I don't want to create extra conflicts when they can be avoided. BR, Jani. [1] http://lore.kernel.org/r/20210413051002.92589-1-lucas.demarchi@xxxxxxxxx > > Cc: Matt Roper <matthew.d.roper@xxxxxxxxx> > > Ville Syrjälä (5): > drm/i915: Restore lost glk FBC 16bpp w/a > drm/i915: Restore lost glk ccs w/a > drm/i915: Disable LTTPR detection on GLK once again > drm/i915: Don't use {skl,cnl}_hpd_pin() for bxt/glk > drm/i915: Remove a few redundant glk checks > > drivers/gpu/drm/i915/display/intel_ddi.c | 6 +++--- > drivers/gpu/drm/i915/display/intel_display.c | 3 ++- > drivers/gpu/drm/i915/display/intel_dp_link_training.c | 2 +- > drivers/gpu/drm/i915/display/intel_fbc.c | 2 +- > drivers/gpu/drm/i915/display/skl_universal_plane.c | 2 +- > 5 files changed, 8 insertions(+), 7 deletions(-) -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
